From fa32db5bfb6247407aa25af0d30b5c939cc8e04d Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Wed, 23 Jun 2010 16:03:31 -0300 Subject: Fix cmake files used by other libs to detect ApiExtractor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewer: Renato Araújo Luciano Wolf --- ApiExtractorConfigVersion.cmake.in | 9 +++++++++ ApiExtractorVersion.cmake.in | 9 --------- CMakeLists.txt | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 ApiExtractorConfigVersion.cmake.in delete mode 100644 ApiExtractorVersion.cmake.in diff --git a/ApiExtractorConfigVersion.cmake.in b/ApiExtractorConfigVersion.cmake.in new file mode 100644 index 000000000..a9f7318f1 --- /dev/null +++ b/ApiExtractorConfigVersion.cmake.in @@ -0,0 +1,9 @@ +set(PACKAGE_VERSION @apiextractor_VERSION@) +if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @apiextractor_MAJOR_VERSION@) + if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @apiextractor_MINOR_VERSION@) + set(PACKAGE_VERSION_COMPATIBLE 1) + if("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @apiextractor_MICRO_VERSION@) + set(PACKAGE_VERSION_EXACT 1) + endif() + endif() +endif() diff --git a/ApiExtractorVersion.cmake.in b/ApiExtractorVersion.cmake.in deleted file mode 100644 index a9f7318f1..000000000 --- a/ApiExtractorVersion.cmake.in +++ /dev/null @@ -1,9 +0,0 @@ -set(PACKAGE_VERSION @apiextractor_VERSION@) -if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @apiextractor_MAJOR_VERSION@) - if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @apiextractor_MINOR_VERSION@) - set(PACKAGE_VERSION_COMPATIBLE 1) - if("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @apiextractor_MICRO_VERSION@) - set(PACKAGE_VERSION_EXACT 1) - endif() - endif() -endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 987c9e752..5cc88c3b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,7 @@ set_target_properties(apiextractor PROPERTIES VERSION ${apiextractor_VERSION} SO configure_file("${CMAKE_CURRENT_SOURCE_DIR}/apiextractor.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/apiextractor.pc" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ApiExtractorConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfig.cmake" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ApiExtractorVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorVersion.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ApiExtractorConfigVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfigVersion.cmake" @ONLY) # uninstall target configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) @@ -151,5 +151,5 @@ install(TARGETS apiextractor EXPORT apiextractor install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apiextractor.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfig.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/ApiExtractor-${apiextractor_VERSION}") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorVersion.cmake" +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfigVersion.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/ApiExtractor-${apiextractor_VERSION}") -- cgit v1.2.3