From b62c8d396f7dbef61122e169ef143276e74eff05 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Fri, 25 Nov 2022 10:54:58 +0000 Subject: Revert: Add version to all LLVM cmake package Summary: This reverts commit ad485b71b51168ce13282ae159bd8feff48baf84. Reviewers: Subscribers: --- polly/cmake/CMakeLists.txt | 9 --------- polly/cmake/PollyConfig.cmake.in | 3 +-- polly/cmake/PollyConfigVersion.cmake.in | 13 ------------- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 polly/cmake/PollyConfigVersion.cmake.in (limited to 'polly') diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt index d7b3fa1..1834107 100644 --- a/polly/cmake/CMakeLists.txt +++ b/polly/cmake/CMakeLists.txt @@ -82,10 +82,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/PollyConfig.cmake.in ${polly_cmake_builddir}/PollyConfig.cmake @ONLY) -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/PollyConfigVersion.cmake.in - ${polly_cmake_builddir}/PollyConfigVersion.cmake - @ONLY) file(GENERATE OUTPUT ${polly_cmake_builddir}/${POLLY_EXPORTS_FILE_NAME} @@ -142,10 +138,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/PollyConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/PollyConfig.cmake @ONLY) -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/PollyConfigVersion.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/PollyConfigVersion.cmake - @ONLY) file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${POLLY_EXPORTS_FILE_NAME} CONTENT "${POLLY_EXPORTS}") @@ -154,7 +146,6 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/PollyConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/PollyConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${POLLY_EXPORTS_FILE_NAME}" DESTINATION "${POLLY_INSTALL_PACKAGE_DIR}") endif () diff --git a/polly/cmake/PollyConfig.cmake.in b/polly/cmake/PollyConfig.cmake.in index d7e8d1f..ce1144d 100644 --- a/polly/cmake/PollyConfig.cmake.in +++ b/polly/cmake/PollyConfig.cmake.in @@ -2,8 +2,7 @@ @POLLY_CONFIG_CODE@ -set(LLVM_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}) -find_package(LLVM @LLVM_VERSION@ EXACT REQUIRED CONFIG +find_package(LLVM REQUIRED CONFIG HINTS "@POLLY_CONFIG_LLVM_CMAKE_DIR@") set(Polly_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}) diff --git a/polly/cmake/PollyConfigVersion.cmake.in b/polly/cmake/PollyConfigVersion.cmake.in deleted file mode 100644 index e9ac4ed..0000000 --- a/polly/cmake/PollyConfigVersion.cmake.in +++ /dev/null @@ -1,13 +0,0 @@ -set(PACKAGE_VERSION "@PACKAGE_VERSION@") - -# LLVM is API-compatible only with matching major.minor versions -# and patch versions not less than that requested. -if("@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@" VERSION_EQUAL - "${PACKAGE_FIND_VERSION_MAJOR}.${PACKAGE_FIND_VERSION_MINOR}" - AND NOT "@LLVM_VERSION_PATCH@" VERSION_LESS "${PACKAGE_FIND_VERSION_PATCH}") - set(PACKAGE_VERSION_COMPATIBLE 1) - if("@LLVM_VERSION_PATCH@" VERSION_EQUAL - "${PACKAGE_FIND_VERSION_PATCH}") - set(PACKAGE_VERSION_EXACT 1) - endif() -endif() -- cgit v1.1