From cc5aae0c6a18ee2f160b4ae2ff85205620f5543c Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Mon, 6 Jul 2020 17:18:38 -0300 Subject: [PATCH 1/4] Export targets Signed-off-by: Jorge Perez --- CMakeLists.txt | 21 ++++++++++++++++++++- mimickConfig.cmake.in | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 mimickConfig.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a743ac..ccb8e45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required (VERSION 2.8) -project (Mimick C) +project (mimick C) include (CheckSymbolExists) include (GNUInstallDirs) @@ -157,6 +157,7 @@ include_directories(include src "${PROJECT_BINARY_DIR}/src") add_subdirectory (src) add_library (mimick STATIC ${SOURCE_FILES}) +target_include_directories(mimick INTERFACE $) foreach (F ${INTERFACE_FILES}) get_filename_component(DEST "${F}" PATH) @@ -164,10 +165,16 @@ foreach (F ${INTERFACE_FILES}) endforeach () install(TARGETS mimick + EXPORT mimick-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +#install(EXPORT mimick-targets +# FILE mimickTargets.cmake +# DESTINATION lib/cmake/mimick +#) + add_custom_target(mimick_tests ALL) function (add_mimick_sample _NAME) @@ -196,3 +203,15 @@ endfunction () enable_testing () add_subdirectory (test) add_subdirectory (sample) + +# Export targets of Mimick library +install(EXPORT mimick-targets DESTINATION lib/cmake/mimick) +include(CMakePackageConfigHelpers) +configure_package_config_file( + "mimickConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/mimickConfig.cmake" + INSTALL_DESTINATION "lib/cmake/mimick" +) + +# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mimick.cmake" DESTINATION "lib/cmake/mimick") +# install(EXPORT mimick-Targets DESTINATION "share/mimick/cmake" +# FILE mimick-config.cmake) diff --git a/mimickConfig.cmake.in b/mimickConfig.cmake.in new file mode 100644 index 0000000..6b01563 --- /dev/null +++ b/mimickConfig.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/mimick-targets.cmake") From 80e47360c8fe7fd805e58fe627273ee1b8713f58 Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Mon, 6 Jul 2020 17:49:52 -0300 Subject: [PATCH 2/4] Add conf cmake to install Signed-off-by: Jorge Perez --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ccb8e45..0cd7f50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,6 +212,6 @@ configure_package_config_file( INSTALL_DESTINATION "lib/cmake/mimick" ) -# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mimick.cmake" DESTINATION "lib/cmake/mimick") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mimickConfig.cmake" DESTINATION "lib/cmake/mimick") # install(EXPORT mimick-Targets DESTINATION "share/mimick/cmake" # FILE mimick-config.cmake) From 7817302a190db12cda94344d7a87c239a24d1ca2 Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Tue, 7 Jul 2020 10:51:37 -0300 Subject: [PATCH 3/4] Remove comments + cleanup Signed-off-by: Jorge Perez --- CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cd7f50..6d39fe8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,11 +170,6 @@ install(TARGETS mimick LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -#install(EXPORT mimick-targets -# FILE mimickTargets.cmake -# DESTINATION lib/cmake/mimick -#) - add_custom_target(mimick_tests ALL) function (add_mimick_sample _NAME) @@ -204,14 +199,10 @@ enable_testing () add_subdirectory (test) add_subdirectory (sample) -# Export targets of Mimick library install(EXPORT mimick-targets DESTINATION lib/cmake/mimick) include(CMakePackageConfigHelpers) configure_package_config_file( "mimickConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/mimickConfig.cmake" INSTALL_DESTINATION "lib/cmake/mimick" ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mimickConfig.cmake" DESTINATION "lib/cmake/mimick") -# install(EXPORT mimick-Targets DESTINATION "share/mimick/cmake" -# FILE mimick-config.cmake) From 1ab4233b89248cf921c969931a13171155624e52 Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Tue, 7 Jul 2020 11:01:00 -0300 Subject: [PATCH 4/4] Restore project name Signed-off-by: Jorge Perez --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d39fe8..6574861 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required (VERSION 2.8) -project (mimick C) +project (Mimick C) include (CheckSymbolExists) include (GNUInstallDirs)