Merge pull request #184 from stefanbuettner/fix-cmake-installation

Fix cmake installation

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.4)
-project(coz C CXX)
+project(coz VERSION 0.2.2 LANGUAGES C CXX)
 
 enable_testing()
 
@@ -18,9 +18,26 @@ option(INSTALL_COZ "Enable installation of coz. (Projects embedding coz may want
 
 if(INSTALL_COZ)
     include(GNUInstallDirs)
+    include(CMakePackageConfigHelpers)
     install(PROGRAMS coz DESTINATION bin)
     install(FILES LICENSE.md DESTINATION licenses)
-    install(FILES cmake/coz-profilerConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+    configure_package_config_file(
+        cmake/coz-profilerConfig.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/coz-profilerConfig.cmake
+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+    write_basic_package_version_file(
+        ${CMAKE_CURRENT_BINARY_DIR}/coz-profilerConfigVersion.cmake
+        COMPATIBILITY ExactVersion) # SameMajor only applies to versions >= 1.0. Versions 0.x have to match exactly according to semver.org
+    install(
+        FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/coz-profilerConfig.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/coz-profilerConfigVersion.cmake
+        DESTINATION
+        ${CMAKE_INSTALL_LIBDIR}/cmake)
+    install(
+        EXPORT coz-profilerTargets
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
+        NAMESPACE coz::)
 endif()
 
 add_subdirectory(libcoz)

cmake/coz-profilerConfig.cmake.in

@@ -0,0 +1,21 @@
+@PACKAGE_INIT@
+
+message(INFO " ${COZ_INCLUDE_DIR} ${COZ_LIBRARY} ${COZ_FOUND}")
+
+# Use find_dependency to find dependend packages.
+
+include(${CMAKE_CURRENT_LIST_DIR}/coz-profilerTargets.cmake)
+
+add_executable(coz::profiler IMPORTED)
+
+# This includes the lib file
+get_target_property(_COZ_LIBARRY_PATH coz::coz IMPORTED_LOCATION)
+# {INSTALLATION}/lib/libcoz.so
+get_filename_component(_IMPORT_PREFIX "${_COZ_LIBRARY_PATH}" PATH)
+# {INSTALLATION}/lib
+get_filename_component(_IMPORT_PREFIX "${_COZ_LIBARRY_PATH}" PATH)
+# {INSTALLATION}
+set_property(TARGET coz::profiler PROPERTY IMPORTED_LOCATION ${_COZ_LIBARRY_PATH})
+# Cleanup temporary variables
+set(_COZ_LIBARRY_PATH)
+

libcoz/CMakeLists.txt

@@ -21,18 +21,19 @@ endif()
 target_include_directories(coz
     PUBLIC
         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:include/coz>)
+        $<INSTALL_INTERFACE:include>)
 target_link_libraries(coz PRIVATE ${CMAKE_DL_LIBS} rt Threads::Threads libelfin::libelfin)
 
 add_library(coz-instrumentation INTERFACE)
 target_include_directories(coz-instrumentation
     INTERFACE
         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:include/coz>)
+        $<INSTALL_INTERFACE:include>)
 target_link_libraries(coz-instrumentation INTERFACE -Wl,--push-state,--no-as-needed ${CMAKE_DL_LIBS} -Wl,--pop-state)
 
 if(INSTALL_COZ)
     install(TARGETS coz
+        EXPORT coz-profilerTargets
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})