Fixed: Misc depends on Carbon under OS X

--HG--
branch : develop

code/CMakeLists.txt

@@ -164,25 +164,30 @@ IF(WITH_SSE2)
   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()
 
@@ -378,8 +383,6 @@ IF(WITH_QT5)
       IF(APPLE)
         FIND_LIBRARY(PCRE_LIBRARY pcre16 pcre)
 
-        FIND_LIBRARY(FOUNDATION_FRAMEWORK Foundation)
-        FIND_LIBRARY(CARBON_FRAMEWORK Carbon)
         FIND_LIBRARY(SECURITY_FRAMEWORK Security)
 
         SET(QT_LIBRARIES ${QT_LIBRARIES}

code/nel/src/misc/CMakeLists.txt

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