0d78d30991
CMake 3.19.2
* Compiler/TI: Fix C standard flags in C-only project
* execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios
* FindHDF5: improve error messages when a location variable isn't known
* FindHDF5: support the hdf5hl_fortran-based variable names
* FindPython2: avoid doubling the extension in CPython2 SOABI
* Tests: Add CMake_TEST_Java option to control Java tests
* Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings
* gitlab-ci: update macOS jobs to use Xcode 12.2
* Tests: Fix RunCMake.Check* conditions for enabling Fortran
* Check*: Tolerate variables set with names of languages
* Ninja: Clean metadata after regen during build on Windows with 1.10.2+
* ci: update to use ninja 1.10.2
* Tests: Look for Visual Studio only on Windows hosts
* CMakeDetermineCompilerId: Filter IAR-AVR format INFO strings earlier
* CMakeDetermineCompilerId: Add whitespace to clarify logic
* CMakeDetermineCompilerId: Tolerate stray text around INFO strings
* Revert "Intel: Add Intel Clang compiler identification"
* Revert "Intel: Add Intel DPC++ compiler identification"
* Tests: Add cache entry to control XCTest deployment target
* Tests: Remove outdated exclusion of tests on OS X 10.3
* ci: Hard-code XCTest deployment target to 10.15
* Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries
* ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages
* ci: do not use sccache for macOS packaging
* ci: update macOS package to produce universal binaries
* macOS: Offer control over host architecture on Apple Silicon hosts
* Tests: Cover macOS host architecture selection on Apple Silicon hosts
* cmake: Clear INSTALL file properties between runs
* macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon
* Ninja: Remove cleandead on regeneration
* Utilities/Release: Update macOS Qt 5.9 build for platform versioning
* cmake-gui: Restore completion during path editing
* Help: xref variable that cmake_minimum_required() sets
* Help: Mention how OPTIMIZE_DEPENDENCIES is initialized
* Help: Re-sort indexes in the manuals
* Help: Clarify scope details of deferred call ids for cmake_language()
* PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config
* export: Do not fail generation for separate namelink only case
* Cray: Fix Cray compiler detection on new platforms
* FPHSA: ensure it can be used outside 'find_package'
* Clang on Windows: 'LINKER:' prefix must be honored
* CMakePackageConfigHelpers: Relax restrictions on version range
* CUDA: Fix user-set architectures during detection with Visual Studio
* macOS: Add architecture flags only for native ASM dialect
* Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag
* ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location
* ISPC: Handle OBJECT sources in different directories
* Document CMP0112 covers $
* ISPC: Treat system includes as '-I' includes
* FindGLUT: Handle Mojave and Big Sur 'tbd' framework files
* ISPC: Generated Headers suffix configurable with a better default
* Help: Fix presets typo (longDescription to displayName)
* QNX: Do not disable compiler extensions for CMake itself
* llvm-rc: Force C language for the clang gnu frontend
* llvm-rc: Add CMAKE_VFS_OVERLAY to the preprocessing flags
35 lines
1.7 KiB
CMake
35 lines
1.7 KiB
CMake
$NetBSD: patch-Modules_Platform_Darwin.cmake,v 1.2 2020/12/17 12:14:35 adam Exp $
|
|
|
|
Prefer pkgsrc over system provided libraries.
|
|
|
|
--- Modules/Platform/Darwin.cmake.orig 2020-12-16 12:35:29.000000000 +0000
|
|
+++ Modules/Platform/Darwin.cmake
|
|
@@ -159,10 +159,10 @@ if(_CMAKE_OSX_SYSROOT_PATH)
|
|
endforeach()
|
|
|
|
if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/lib)
|
|
- list(INSERT CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr/lib)
|
|
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${_CMAKE_OSX_SYSROOT_PATH}/usr/lib)
|
|
endif()
|
|
if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/lib)
|
|
- list(INSERT CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/lib)
|
|
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/lib)
|
|
endif()
|
|
endif()
|
|
if (OSX_DEVELOPER_ROOT AND EXISTS "${OSX_DEVELOPER_ROOT}/Library/Frameworks")
|
|
@@ -225,13 +225,13 @@ endif()
|
|
|
|
if(_CMAKE_OSX_SYSROOT_PATH)
|
|
if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
|
|
- list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr)
|
|
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr)
|
|
foreach(lang C CXX OBJC OBJCXX Swift)
|
|
list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
|
|
endforeach()
|
|
endif()
|
|
if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/include)
|
|
- list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr/local)
|
|
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr/local)
|
|
foreach(lang C CXX OBJC OBJCXX Swift)
|
|
list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/include)
|
|
endforeach()
|