Sfoglia il codice sorgente

Merge topic 'drop-try_run-macro'

4b2e765025 Drop try_run macro from CMake's own build

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7719
Brad King 3 anni fa
parent
commit
2992d4057a
1 ha cambiato i file con 0 aggiunte e 11 eliminazioni
  1. 0 11
      CMakeLists.txt

+ 0 - 11
CMakeLists.txt

@@ -60,17 +60,6 @@ else()
   set(USE_LGPL "")
   set(USE_LGPL "")
 endif()
 endif()
 
 
-if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
-  # Disallow architecture-specific try_run.  It may not run on the host.
-  macro(TRY_RUN)
-    if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
-      message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
-    else()
-      _TRY_RUN(${ARGV})
-    endif()
-  endmacro()
-endif()
-
 # Use most-recent available language dialects with GNU and Clang
 # Use most-recent available language dialects with GNU and Clang
 if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
 if(NOT DEFINED CMAKE_C_STANDARD AND NOT CMake_NO_C_STANDARD)
   include(${CMake_SOURCE_DIR}/Source/Checks/cm_c11_thread_local.cmake)
   include(${CMake_SOURCE_DIR}/Source/Checks/cm_c11_thread_local.cmake)