Browse Source

Merge topic 'use-new-project-try_compile'

d00d8537f6 Modules: Use new keyword-dispatched try_compile signature

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !7690
Brad King 3 năm trước cách đây
mục cha
commit
620cf9efa7

+ 3 - 2
Modules/CMakeDetermineCompilerABI.cmake

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

+ 3 - 3
Modules/CheckIPOSupported.cmake

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

+ 3 - 3
Modules/FindSDL_sound.cmake

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

+ 4 - 4
Modules/FortranCInterface.cmake

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

+ 4 - 4
Modules/FortranCInterface/Detect.cmake

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