diff options
| -rw-r--r-- | cmake/modules/FindCCache.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/osx/ArchSetup.cmake | 2 | ||||
| -rw-r--r-- | tools/depends/native/cmake/Makefile | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cmake/modules/FindCCache.cmake b/cmake/modules/FindCCache.cmake index a18d4e03e0..0f6463b709 100644 --- a/cmake/modules/FindCCache.cmake +++ b/cmake/modules/FindCCache.cmake @@ -16,8 +16,8 @@ if(CCACHE_FOUND) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}") - file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n") - file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n") + file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n") + file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n") execute_process(COMMAND chmod +x "${CMAKE_BINARY_DIR}/launch-c" "${CMAKE_BINARY_DIR}/launch-cxx") set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/launch-c" PARENT_SCOPE) diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake index 7d8f58bc43..f723aa24c4 100644 --- a/cmake/scripts/osx/ArchSetup.cmake +++ b/cmake/scripts/osx/ArchSetup.cmake @@ -23,6 +23,8 @@ else() endif() endif() +set(CMAKE_OSX_ARCHITECTURES ${CPU}) + # Additional SYSTEM_DEFINES list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_SDL -DHAS_ZEROCONF) diff --git a/tools/depends/native/cmake/Makefile b/tools/depends/native/cmake/Makefile index 426ebe0628..08607fed34 100644 --- a/tools/depends/native/cmake/Makefile +++ b/tools/depends/native/cmake/Makefile @@ -3,7 +3,7 @@ PLATFORM=$(NATIVEPLATFORM) DEPS= ../../Makefile.include Makefile APPNAME=cmake -VERSION=3.14.5 +VERSION=3.18.4 SOURCE=$(APPNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz |