omnitrace find_package support (#3)
* omnitrace find_package support
- Fix to INSTALL_DESTINATION for configure_package_config_file
- Fixes to ConfigInstall.cmake and omnitrace-config.cmake.in
* Test find_package
[ROCm/rocprofiler-systems commit: d2e635ed3c]
This commit is contained in:
Jonathan R. Madsen
committed by
GitHub
GitHub
parent
e84ffb80de
commit
76f30b1c6d
@@ -18,15 +18,16 @@ target_sources(omnitrace-dl-library PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dl.cpp
|
||||
target_include_directories(
|
||||
omnitrace-dl-library
|
||||
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../omnitrace-user>)
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../omnitrace-user>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
|
||||
target_link_libraries(
|
||||
omnitrace-dl-library
|
||||
PUBLIC
|
||||
${dl_LIBRARY}
|
||||
$<BUILD_INTERFACE:omnitrace::common-library>
|
||||
$<BUILD_INTERFACE:omnitrace::omnitrace-compile-definitions>
|
||||
$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBGCC}>,$<BUILD_INTERFACE:omnitrace::omnitrace-static-libgcc>,>
|
||||
$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBSTDCXX}>,$<BUILD_INTERFACE:omnitrace::omnitrace-static-libstdcxx>,>
|
||||
$<BUILD_INTERFACE:$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBGCC}>,omnitrace::omnitrace-static-libgcc,>>
|
||||
$<BUILD_INTERFACE:$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBSTDCXX}>,omnitrace::omnitrace-static-libstdcxx,>>
|
||||
)
|
||||
|
||||
add_target_cxx_flag_if_avail(omnitrace-dl-library "-ftls-model=global-dynamic")
|
||||
@@ -42,14 +43,10 @@ set_target_properties(
|
||||
|
||||
omnitrace_strip_target(omnitrace-dl-library)
|
||||
|
||||
install(
|
||||
TARGETS omnitrace-dl-library
|
||||
EXPORT omnitrace-dl-library-targets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
OPTIONAL)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dl.hpp
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/omnitrace)
|
||||
|
||||
install(
|
||||
EXPORT omnitrace-dl-library-targets
|
||||
FILE omnitrace-dl-library-targets.cmake
|
||||
NAMESPACE omnitrace::
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/omnitrace)
|
||||
TARGETS omnitrace-dl-library
|
||||
EXPORT omnitrace-library-targets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "common/join.hpp"
|
||||
|
||||
#include <cassert>
|
||||
#include <gnu/libc-version.h>
|
||||
|
||||
//--------------------------------------------------------------------------------------//
|
||||
|
||||
|
||||
@@ -20,9 +20,17 @@
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
#pragma once
|
||||
#ifndef OMNITRACE_DL_HPP_
|
||||
#define OMNITRACE_DL_HPP_ 1
|
||||
|
||||
#if defined(OMNITRACE_DL_SOURCE) && (OMNITRACE_DL_SOURCE > 0)
|
||||
# include "common/defines.h"
|
||||
#else
|
||||
# if !defined(OMNITRACE_PUBLIC_API)
|
||||
# define OMNITRACE_PUBLIC_API
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "common/defines.h"
|
||||
#include "omnitrace/user.h"
|
||||
|
||||
#include <atomic>
|
||||
@@ -32,7 +40,6 @@
|
||||
#include <cstring>
|
||||
#include <dlfcn.h>
|
||||
#include <functional>
|
||||
#include <gnu/libc-version.h>
|
||||
#include <iostream>
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
@@ -88,3 +95,5 @@ extern "C"
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif // OMNITRACE_DL_HPP_ 1
|
||||
|
||||
@@ -33,19 +33,10 @@ set_target_properties(
|
||||
|
||||
omnitrace_strip_target(omnitrace-user-library)
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/omnitrace/user.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/omnitrace)
|
||||
|
||||
install(
|
||||
TARGETS omnitrace-user-library
|
||||
EXPORT omnitrace-user-library-targets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
OPTIONAL)
|
||||
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_SOURCE_DIR}/omnitrace/user.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/omnitrace
|
||||
OPTIONAL)
|
||||
|
||||
install(
|
||||
EXPORT omnitrace-user-library-targets
|
||||
FILE omnitrace-user-library-targets.cmake
|
||||
NAMESPACE omnitrace::
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/omnitrace)
|
||||
EXPORT omnitrace-library-targets
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
@@ -23,10 +23,27 @@
|
||||
#ifndef OMNITRACE_USER_H_
|
||||
#define OMNITRACE_USER_H_ 1
|
||||
|
||||
#define OMNITRACE_ATTRIBUTE(...) __attribute__((__VA_ARGS__))
|
||||
#define OMNITRACE_VISIBILITY(MODE) OMNITRACE_ATTRIBUTE(visibility(MODE))
|
||||
#define OMNITRACE_PUBLIC_API OMNITRACE_VISIBILITY("default")
|
||||
#define OMNITRACE_HIDDEN_API OMNITRACE_VISIBILITY("hidden")
|
||||
#if defined(OMNITRACE_USER_SOURCE) && (OMNITRACE_USER_SOURCE > 0)
|
||||
# if !defined(OMNITRACE_ATTRIBUTE)
|
||||
# define OMNITRACE_ATTRIBUTE(...) __attribute__((__VA_ARGS__))
|
||||
# endif
|
||||
# if !defined(OMNITRACE_VISIBILITY)
|
||||
# define OMNITRACE_VISIBILITY(MODE) OMNITRACE_ATTRIBUTE(visibility(MODE))
|
||||
# endif
|
||||
# if !defined(OMNITRACE_PUBLIC_API)
|
||||
# define OMNITRACE_PUBLIC_API OMNITRACE_VISIBILITY("default")
|
||||
# endif
|
||||
# if !defined(OMNITRACE_HIDDEN_API)
|
||||
# define OMNITRACE_HIDDEN_API OMNITRACE_VISIBILITY("hidden")
|
||||
# endif
|
||||
#else
|
||||
# if !defined(OMNITRACE_PUBLIC_API)
|
||||
# define OMNITRACE_PUBLIC_API
|
||||
# endif
|
||||
# if !defined(OMNITRACE_HIDDEN_API)
|
||||
# define OMNITRACE_HIDDEN_API
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C"
|
||||
|
||||
@@ -20,7 +20,9 @@
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
#define OMNITRACE_SOURCE 1
|
||||
#if !defined(OMNITRACE_USER_SOURCE)
|
||||
# define OMNITRACE_USER_SOURCE 1
|
||||
#endif
|
||||
|
||||
#include "omnitrace/user.h"
|
||||
|
||||
|
||||
@@ -13,8 +13,10 @@ target_include_directories(
|
||||
|
||||
target_compile_definitions(
|
||||
omnitrace-interface-library
|
||||
INTERFACE OMNITRACE_MAX_THREADS=${OMNITRACE_MAX_THREADS}
|
||||
$<IF:$<BOOL:${OMNITRACE_CUSTOM_DATA_SOURCE}>,CUSTOM_DATA_SOURCE,>)
|
||||
INTERFACE
|
||||
OMNITRACE_MAX_THREADS=${OMNITRACE_MAX_THREADS}
|
||||
$<BUILD_INTERFACE:$<IF:$<BOOL:${OMNITRACE_CUSTOM_DATA_SOURCE}>,CUSTOM_DATA_SOURCE,>>
|
||||
)
|
||||
|
||||
target_link_libraries(
|
||||
omnitrace-interface-library
|
||||
@@ -30,9 +32,10 @@ target_link_libraries(
|
||||
$<BUILD_INTERFACE:omnitrace::omnitrace-hip>
|
||||
$<BUILD_INTERFACE:omnitrace::omnitrace-roctracer>
|
||||
$<BUILD_INTERFACE:omnitrace::omnitrace-rocm-smi>
|
||||
$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBGCC}>,$<BUILD_INTERFACE:omnitrace::omnitrace-static-libgcc>,>
|
||||
$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBSTDCXX}>,$<BUILD_INTERFACE:omnitrace::omnitrace-static-libstdcxx>,>
|
||||
$<IF:$<BOOL:${OMNITRACE_USE_SANITIZER}>,omnitrace::omnitrace-sanitizer,>)
|
||||
$<BUILD_INTERFACE:$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBGCC}>,omnitrace::omnitrace-static-libgcc,>>
|
||||
$<BUILD_INTERFACE:$<IF:$<BOOL:${OMNITRACE_BUILD_STATIC_LIBSTDCXX}>,omnitrace::omnitrace-static-libstdcxx,>>
|
||||
$<BUILD_INTERFACE:$<IF:$<BOOL:${OMNITRACE_USE_SANITIZER}>,omnitrace::omnitrace-sanitizer,>>
|
||||
)
|
||||
|
||||
# ------------------------------------------------------------------------------#
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user