echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'use-new-project-try_compile'

Browse Source 
d00d8537f6 Modules: Use new keyword-dispatched try_compile signature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7690
This commit is contained in:
Brad King 2022-09-19 14:25:16 +00:00 committed by Kitware Robot
commit 620cf9efa7
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CMakeDetermineCompilerABI.cmake
View File

@ -162,8 +162,9 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
message(CHECK_START "Determine Intel Fortran Compiler Implicit Link Path") message(CHECK_START "Determine Intel Fortran Compiler Implicit Link Path")
# Build a sample project which reports symbols. # Build a sample project which reports symbols.
try_compile(IFORT_LIB_PATH_COMPILED try_compile(IFORT_LIB_PATH_COMPILED
${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath PROJECT IntelFortranImplicit
${CMAKE_ROOT}/Modules/IntelVSImplicitPath SOURCE_DIR ${CMAKE_ROOT}/Modules/IntelVSImplicitPath
BINARY_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath
IntelFortranImplicit IntelFortranImplicit
CMAKE_FLAGS CMAKE_FLAGS
"-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}" "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"

6
Modules/CheckIPOSupported.cmake
View File

@ -137,9 +137,9 @@ macro(_ipo_run_language_check language)
try_compile( try_compile(
_IPO_LANGUAGE_CHECK_RESULT _IPO_LANGUAGE_CHECK_RESULT
"${bindir}" PROJECT "${TRY_COMPILE_PROJECT_NAME}"
"${srcdir}" SOURCE_DIR "${srcdir}"
"${TRY_COMPILE_PROJECT_NAME}" BINARY_DIR "${bindir}"
CMAKE_FLAGS CMAKE_FLAGS
"-DCMAKE_VERBOSE_MAKEFILE=ON" "-DCMAKE_VERBOSE_MAKEFILE=ON"
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON"

6
Modules/FindSDL_sound.cmake
View File

@ -185,9 +185,9 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
try_compile( try_compile(
MY_RESULT MY_RESULT
${PROJECT_BINARY_DIR}/CMakeTmp PROJECT DetermineSoundLibs
${PROJECT_BINARY_DIR}/CMakeTmp SOURCE_DIR ${PROJECT_BINARY_DIR}/CMakeTmp
DetermineSoundLibs BINARY_DIR ${PROJECT_BINARY_DIR}/CMakeTmp
OUTPUT_VARIABLE MY_OUTPUT OUTPUT_VARIABLE MY_OUTPUT
) )

8
Modules/FortranCInterface.cmake
View File

@ -361,10 +361,10 @@ function(FortranCInterface_VERIFY)
# Build a sample project which reports symbols. # Build a sample project which reports symbols.
set(CMAKE_TRY_COMPILE_CONFIGURATION Release) set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
try_compile(FortranCInterface_VERIFY_${lang}_COMPILED try_compile(FortranCInterface_VERIFY_${lang}_COMPILED
${FortranCInterface_BINARY_DIR}/Verify${lang} PROJECT VerifyFortranC
${FortranCInterface_SOURCE_DIR}/Verify TARGET VerifyFortranC
VerifyFortranC # project name SOURCE_DIR ${FortranCInterface_SOURCE_DIR}/Verify
VerifyFortranC # target name BINARY_DIR ${FortranCInterface_BINARY_DIR}/Verify${lang}
CMAKE_FLAGS -DVERIFY_CXX=${verify_cxx} CMAKE_FLAGS -DVERIFY_CXX=${verify_cxx}
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_VERBOSE_MAKEFILE=ON
"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}" "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"

8
Modules/FortranCInterface/Detect.cmake
View File

@ -47,10 +47,10 @@ unset(_FortranCInterface_CMP0056)
# Build a sample project which reports symbols. # Build a sample project which reports symbols.
set(CMAKE_TRY_COMPILE_CONFIGURATION Release) set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
try_compile(FortranCInterface_COMPILED try_compile(FortranCInterface_COMPILED
${FortranCInterface_BINARY_DIR} PROJECT FortranCInterface
${FortranCInterface_SOURCE_DIR} TARGET FortranCInterface
FortranCInterface # project name SOURCE_DIR ${FortranCInterface_SOURCE_DIR}
FortranCInterface # target name BINARY_DIR ${FortranCInterface_BINARY_DIR}
CMAKE_FLAGS CMAKE_FLAGS
"-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}" "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
"-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}" "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"