diff options
| author | Nico Weber <thakis@chromium.org> | 2023-05-17 10:46:45 -0400 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2023-05-17 10:53:33 -0400 |
| commit | d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6 (patch) | |
| tree | efbb52b2ca03bfac87b6e9a3ebb106d8428270cb /openmp/tools | |
| parent | d9610b4a56c532614545eef5995362e99b776535 (diff) | |
| download | llvm-d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.zip llvm-d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.tar.gz llvm-d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.tar.bz2 | |
Revert "Reland "[CMake] Bumps minimum version to 3.20.0.""
This reverts commit 65429b9af6a2c99d340ab2dcddd41dab201f399c.
Broke several projects, see https://reviews.llvm.org/D144509#4347562 onwards.
Also reverts follow-up commit "[OpenMP] Compile assembly files as ASM, not C"
This reverts commit 4072c8aee4c89c4457f4f30d01dc9bb4dfa52559.
Also reverts fix attempt "[cmake] Set CMP0091 to fix Windows builds after the cmake_minimum_required bump"
This reverts commit 7d47dac5f828efd1d378ba44a97559114f00fb64.
Diffstat (limited to 'openmp/tools')
| -rw-r--r-- | openmp/tools/Modules/FindOpenMPTarget.cmake | 2 | ||||
| -rw-r--r-- | openmp/tools/Modules/README.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openmp/tools/Modules/FindOpenMPTarget.cmake b/openmp/tools/Modules/FindOpenMPTarget.cmake index 4242940..3591a49 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 b8cc5f0..f19619e 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 |