Browse Source

CMake: Move try-compile-type command to earlier in the build process.

Donny Lawrence 6 years ago
parent
commit
0d4dcbc430
2 changed files with 4 additions and 5 deletions
  1. 4 0
      dtool/CompilerFlags.cmake
  2. 0 5
      dtool/LocalSetup.cmake

+ 4 - 0
dtool/CompilerFlags.cmake

@@ -33,6 +33,10 @@ set(CMAKE_BINARY_DIR "${CMAKE_BINARY_DIR}/cmake")
 if(CMAKE_GENERATOR STREQUAL "Xcode")
 if(CMAKE_GENERATOR STREQUAL "Xcode")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE NO) # for now
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE NO) # for now
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+  set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
+
+  # Xcode complains about codesigning if this option isn't set.
+  set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 
 
   # On the Xcode generator, CMake generates a separate make target definition for
   # On the Xcode generator, CMake generates a separate make target definition for
   # every config, so it ends up spamming warnings once we try to build.
   # every config, so it ends up spamming warnings once we try to build.

+ 0 - 5
dtool/LocalSetup.cmake

@@ -6,11 +6,6 @@
 # file based on the user's selected configure variables.
 # file based on the user's selected configure variables.
 #
 #
 
 
-if(CMAKE_SYSTEM_NAME STREQUAL iOS)
-  # Xcode complains about codesigning if this option isn't set.
-  set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
-endif()
-
 include(CheckCXXSourceCompiles)
 include(CheckCXXSourceCompiles)
 include(CheckCSourceRuns)
 include(CheckCSourceRuns)
 include(CheckIncludeFileCXX)
 include(CheckIncludeFileCXX)