aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-22 07:06:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Misc depends on Carbon under OS X

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2017-04-21 11:03:39 +02:00
parent 72b37450b4
commit 8dca705f73
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
code/CMakeLists.txt
View file

@ -164,25 +164,30 @@ IF(WITH_SSE2)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(APPLE_CERTIFICATE) IF(APPLE)
# Find codesign_allocate FIND_LIBRARY(CARBON_FRAMEWORK Carbon)
FIND_LIBRARY(FOUNDATION_FRAMEWORK Foundation)
# Xcode 7.0 and later versions IF(APPLE_CERTIFICATE)
SET(CODESIGN_ALLOCATE ${OSX_DEVELOPER_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/codesign_allocate) # Find codesign_allocate
IF(NOT EXISTS "${CODESIGN_ALLOCATE}") # Xcode 7.0 and later versions
# Xcode 6.4 and previous versions SET(CODESIGN_ALLOCATE ${OSX_DEVELOPER_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/codesign_allocate)
SET(CODESIGN_ALLOCATE ${CMAKE_OSX_SYSROOT}/usr/bin/codesign_allocate)
ENDIF()
IF(NOT EXISTS "${CODESIGN_ALLOCATE}") IF(NOT EXISTS "${CODESIGN_ALLOCATE}")
# System path # Xcode 6.4 and previous versions
SET(CODESIGN_ALLOCATE /usr/bin/codesign_allocate) SET(CODESIGN_ALLOCATE ${CMAKE_OSX_SYSROOT}/usr/bin/codesign_allocate)
ENDIF() ENDIF()
IF(NOT EXISTS "${CODESIGN_ALLOCATE}") IF(NOT EXISTS "${CODESIGN_ALLOCATE}")
MESSAGE(WARNING "Unable to find codesign_allocate in standard directories") # System path
SET(CODESIGN_ALLOCATE) SET(CODESIGN_ALLOCATE /usr/bin/codesign_allocate)
ENDIF()
IF(NOT EXISTS "${CODESIGN_ALLOCATE}")
MESSAGE(WARNING "Unable to find codesign_allocate in standard directories")
SET(CODESIGN_ALLOCATE)
ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
@ -378,8 +383,6 @@ IF(WITH_QT5)
IF(APPLE) IF(APPLE)
FIND_LIBRARY(PCRE_LIBRARY pcre16 pcre) FIND_LIBRARY(PCRE_LIBRARY pcre16 pcre)
FIND_LIBRARY(FOUNDATION_FRAMEWORK Foundation)
FIND_LIBRARY(CARBON_FRAMEWORK Carbon)
FIND_LIBRARY(SECURITY_FRAMEWORK Security) FIND_LIBRARY(SECURITY_FRAMEWORK Security)
SET(QT_LIBRARIES ${QT_LIBRARIES} SET(QT_LIBRARIES ${QT_LIBRARIES}

4
code/nel/src/misc/CMakeLists.txt
View file

@ -202,7 +202,9 @@ ENDIF()
IF(UNIX) IF(UNIX)
TARGET_LINK_LIBRARIES(nelmisc -lc -ldl) TARGET_LINK_LIBRARIES(nelmisc -lc -ldl)
IF(NOT APPLE) IF(APPLE)
TARGET_LINK_LIBRARIES(nelmisc ${CARBON_FRAMEWORK})
ELSE()
TARGET_LINK_LIBRARIES(nelmisc -lrt) TARGET_LINK_LIBRARIES(nelmisc -lrt)
ENDIF() ENDIF()
ENDIF() ENDIF()