mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 05:11:15 -06:00
cde2596a19
The quoting added by commit8c5221fb1f(try_compile: Preserve special characters in COMPILE_DEFINITIONS, 2019-01-21, v3.14.0-rc1~108^2~3) broke the case that the `COMPILE_DEFINITIONS` value contains a `;`. Without the quoting the `;` would be generated literally in an unquoted argument in the test `CMakeLists.txt` file and would then be expanded. With quoting the `;` is preserved, which is not the old behavior. Fix this by expanding the `;`-list ahead of time. Add test cases for behavior with both `#` and `;`. This was noticed with the PGI compiler where we set `CMAKE_CXX*_STANDARD_COMPILE_OPTION` to values like `--c++17;-A`. The symptom had also been observed while preparing commitef8f237686(ParseImplicitIncludeInfo: add SunPro Fortran and PGI compiler, Cray fix, 2019-01-29, v3.14.0-rc1~26^2~2) but was not recognized at the time as a regression. Revert the workaround added by that commit. Fixes: #18919
22 lines
832 B
CMake
22 lines
832 B
CMake
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
|
# file Copyright.txt or https://cmake.org/licensing for details.
|
|
|
|
include(Compiler/Cray)
|
|
__compiler_cray(C)
|
|
|
|
string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
|
|
string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -DNDEBUG")
|
|
|
|
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1)
|
|
set(CMAKE_C90_STANDARD_COMPILE_OPTION -h noc99,conform)
|
|
set(CMAKE_C90_EXTENSION_COMPILE_OPTION -h noc99,gnu)
|
|
set(CMAKE_C99_STANDARD_COMPILE_OPTION -h c99,conform)
|
|
set(CMAKE_C99_EXTENSION_COMPILE_OPTION -h c99,gnu)
|
|
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.5)
|
|
set(CMAKE_C11_STANDARD_COMPILE_OPTION -h std=c11,conform)
|
|
set(CMAKE_C11_EXTENSION_COMPILE_OPTION -h std=c11,gnu)
|
|
endif ()
|
|
endif ()
|
|
|
|
__compiler_check_default_language_standard(C 8.1 99)
|