diff options
author | Mark de Wever <koraq@xs4all.nl> | 2023-05-06 11:43:02 +0200 |
---|---|---|
committer | Mark de Wever <koraq@xs4all.nl> | 2023-05-06 11:43:02 +0200 |
commit | ffb807ab5375b3f78df198dc5d4302b3b552242f (patch) | |
tree | 7e5f8afbb9414ac5ef6fee393a3141c2b4b40816 /openmp | |
parent | 01fa764c9a3473f2c63241ac5e874019e666f405 (diff) | |
download | llvm-ffb807ab5375b3f78df198dc5d4302b3b552242f.tar.gz |
Reland "[CMake] Bumps minimum version to 3.20.0."
All build bots should be updated now.
This reverts commit 44d38022ab29a3156349602733b3459df5beef93.
Diffstat (limited to 'openmp')
-rw-r--r-- | openmp/CMakeLists.txt | 9 | ||||
-rw-r--r-- | openmp/cmake/DetectTestCompiler/CMakeLists.txt | 2 | ||||
-rw-r--r-- | openmp/docs/SupportAndFAQ.rst | 4 | ||||
-rw-r--r-- | openmp/libompd/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | openmp/libomptarget/plugins/remote/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | openmp/tools/Modules/FindOpenMPTarget.cmake | 2 | ||||
-rw-r--r-- | openmp/tools/Modules/README.rst | 4 |
7 files changed, 9 insertions, 16 deletions
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index a87ea2fb57c5..50246b663289 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -12,13 +12,6 @@ list(INSERT CMAKE_MODULE_PATH 0 if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") set(OPENMP_STANDALONE_BUILD TRUE) project(openmp C CXX) - if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0") - message(WARNING - "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the " - "minimum version of CMake required to build LLVM will become 3.20.0, and " - "using an older CMake will become an error. Please upgrade your CMake to " - "at least 3.20.0 now to avoid issues in the future!") - endif() endif() # Must go below project(..) diff --git a/openmp/cmake/DetectTestCompiler/CMakeLists.txt b/openmp/cmake/DetectTestCompiler/CMakeLists.txt index bc2aa52fbc1c..8ea7ab8d45ba 100644 --- a/openmp/cmake/DetectTestCompiler/CMakeLists.txt +++ b/openmp/cmake/DetectTestCompiler/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) project(DetectTestCompiler C CXX) include(CheckCCompilerFlag) diff --git a/openmp/docs/SupportAndFAQ.rst b/openmp/docs/SupportAndFAQ.rst index 249eb18b82a2..c50433bb5b6e 100644 --- a/openmp/docs/SupportAndFAQ.rst +++ b/openmp/docs/SupportAndFAQ.rst @@ -307,7 +307,7 @@ require a few additions. .. code-block:: cmake - cmake_minimum_required(VERSION 3.13.4) + cmake_minimum_required(VERSION 3.20.0) project(offloadTest VERSION 1.0 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp") @@ -318,7 +318,7 @@ require a few additions. target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX) target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp) -Using this module requires at least CMake version 3.13.4. Supported languages +Using this module requires at least CMake version 3.20.0. Supported languages are C and C++ with Fortran support planned in the future. Compiler support is best for Clang but this module should work for other compiler vendors such as IBM, GNU. diff --git a/openmp/libompd/src/CMakeLists.txt b/openmp/libompd/src/CMakeLists.txt index f361fcf35a27..0402a0177201 100644 --- a/openmp/libompd/src/CMakeLists.txt +++ b/openmp/libompd/src/CMakeLists.txt @@ -9,7 +9,7 @@ # project (libompd) -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) add_library (ompd SHARED TargetValue.cpp omp-debug.cpp omp-state.cpp omp-icv.cpp) diff --git a/openmp/libomptarget/plugins/remote/src/CMakeLists.txt b/openmp/libomptarget/plugins/remote/src/CMakeLists.txt index 6299fb38ee8b..8a16963c913a 100644 --- a/openmp/libomptarget/plugins/remote/src/CMakeLists.txt +++ b/openmp/libomptarget/plugins/remote/src/CMakeLists.txt @@ -10,7 +10,7 @@ # ##===----------------------------------------------------------------------===## -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) # Define the suffix for the runtime messaging dumps. add_definitions(-DTARGET_NAME=RPC) diff --git a/openmp/tools/Modules/FindOpenMPTarget.cmake b/openmp/tools/Modules/FindOpenMPTarget.cmake index 3591a49f685b..424294090d5d 100644 --- a/openmp/tools/Modules/FindOpenMPTarget.cmake +++ b/openmp/tools/Modules/FindOpenMPTarget.cmake @@ -79,7 +79,7 @@ be used to override the standard flag searching for a given compiler. # TODO: Test more compilers cmake_policy(PUSH) -cmake_policy(VERSION 3.13.4) +cmake_policy(VERSION 3.20.0) find_package(OpenMP ${OpenMPTarget_FIND_VERSION} REQUIRED) diff --git a/openmp/tools/Modules/README.rst b/openmp/tools/Modules/README.rst index f19619e389b3..b8cc5f08b390 100644 --- a/openmp/tools/Modules/README.rst +++ b/openmp/tools/Modules/README.rst @@ -26,7 +26,7 @@ require a few additions. .. code-block:: cmake - cmake_minimum_required(VERSION 3.13.4) + cmake_minimum_required(VERSION 3.20.0) project(offloadTest VERSION 1.0 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp") @@ -37,7 +37,7 @@ require a few additions. target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX) target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp) -Using this module requires at least CMake version 3.13.4. Supported languages +Using this module requires at least CMake version 3.20.0. Supported languages are C and C++ with Fortran support planned in the future. If your application requires building for a specific device architecture you can set the ``OpenMPTarget_<device>_ARCH=<flag>`` variable. Compiler support is best for |