diff options
author | Mark de Wever <koraq@xs4all.nl> | 2023-03-04 18:28:13 +0100 |
---|---|---|
committer | Mark de Wever <koraq@xs4all.nl> | 2023-03-04 18:28:13 +0100 |
commit | 92523a35a827539db8557bbc3ecab7f9ea3f6ade (patch) | |
tree | 12470d10badc36a0bedd848cbaf0f9c4dab66179 /openmp | |
parent | 2708869801ae00f4681f6b2d9d69b25b3fce26b6 (diff) | |
download | llvm-92523a35a827539db8557bbc3ecab7f9ea3f6ade.tar.gz |
Revert "[CMake] Bumps minimum version to 3.20.0."
Some build bots have not been updated to the new minimal CMake version.
Reverting for now and ping the buildbot owners.
This reverts commit 44c6b905f8527635e49bb3ea97dea315f92d38ec.
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/runtime/cmake/LibompCheckLinkerFlag.cmake | 2 | ||||
-rw-r--r-- | openmp/tools/Modules/FindOpenMPTarget.cmake | 2 | ||||
-rw-r--r-- | openmp/tools/Modules/README.rst | 4 |
8 files changed, 17 insertions, 10 deletions
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index 50246b663289..a87ea2fb57c5 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20.0) +cmake_minimum_required(VERSION 3.13.4) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -12,6 +12,13 @@ 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 8ea7ab8d45ba..bc2aa52fbc1c 100644 --- a/openmp/cmake/DetectTestCompiler/CMakeLists.txt +++ b/openmp/cmake/DetectTestCompiler/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20.0) +cmake_minimum_required(VERSION 3.13.4) project(DetectTestCompiler C CXX) include(CheckCCompilerFlag) diff --git a/openmp/docs/SupportAndFAQ.rst b/openmp/docs/SupportAndFAQ.rst index 0951ec1c2b55..4ccc2ae2963f 100644 --- a/openmp/docs/SupportAndFAQ.rst +++ b/openmp/docs/SupportAndFAQ.rst @@ -300,7 +300,7 @@ require a few additions. .. code-block:: cmake - cmake_minimum_required(VERSION 3.20.0) + cmake_minimum_required(VERSION 3.13.4) project(offloadTest VERSION 1.0 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp") @@ -311,7 +311,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.20.0. Supported languages +Using this module requires at least CMake version 3.13.4. 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 0402a0177201..f361fcf35a27 100644 --- a/openmp/libompd/src/CMakeLists.txt +++ b/openmp/libompd/src/CMakeLists.txt @@ -9,7 +9,7 @@ # project (libompd) -cmake_minimum_required(VERSION 3.20.0) +cmake_minimum_required(VERSION 3.13.4) 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 8a16963c913a..6299fb38ee8b 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.20.0) +cmake_minimum_required(VERSION 3.13.4) # Define the suffix for the runtime messaging dumps. add_definitions(-DTARGET_NAME=RPC) diff --git a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake b/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake index 0026347b1c14..bcc0ca80c866 100644 --- a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake +++ b/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake @@ -19,7 +19,7 @@ function(libomp_check_linker_flag flag boolean) set(library_source "int foo(int a) { return a*a; }") set(cmake_source - "cmake_minimum_required(VERSION 3.20.0) + "cmake_minimum_required(VERSION 3.13.4) project(foo C) set(CMAKE_SHARED_LINKER_FLAGS \"${flag}\") add_library(foo SHARED src_to_link.c)") diff --git a/openmp/tools/Modules/FindOpenMPTarget.cmake b/openmp/tools/Modules/FindOpenMPTarget.cmake index 424294090d5d..3591a49f685b 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.20.0) +cmake_policy(VERSION 3.13.4) find_package(OpenMP ${OpenMPTarget_FIND_VERSION} REQUIRED) diff --git a/openmp/tools/Modules/README.rst b/openmp/tools/Modules/README.rst index b8cc5f08b390..f19619e389b3 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.20.0) + cmake_minimum_required(VERSION 3.13.4) 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.20.0. Supported languages +Using this module requires at least CMake version 3.13.4. 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 |