+4

cmake/darling_framework.cmake

reviewed

··· 13 13 set(DYLIB_INSTALL_NAME "/System/Library/Frameworks/${name}.framework/Versions/${FRAMEWORK_VERSION}/${name}") 14 14 add_darling_library(${my_name} SHARED ${FRAMEWORK_SOURCES}) 15 15 16 16 + if (FRAMEWORK_CURRENT_VERSION) 17 17 + add_library("${name}_${FRAMEWORK_VERSION}" ALIAS "${name}") 18 18 + endif (FRAMEWORK_CURRENT_VERSION) 19 19 + 16 20 set_target_properties(${my_name} PROPERTIES 17 21 OUTPUT_NAME "${name}" 18 22 SUFFIX ""

+2 -1

cmake/use_ld64.cmake

reviewed

··· 33 33 -Wl,-dylib_file,/usr/lib/system/libsystem_malloc.dylib:${CMAKE_BINARY_DIR}/src/libmalloc/libsystem_malloc_firstpass.dylib \ 34 34 -Wl,-dylib_file,/usr/lib/libobjc.A.dylib:${CMAKE_BINARY_DIR}/src/external/objc4/runtime/libobjc.A.dylib \ 35 35 -Wl,-dylib_file,/usr/lib/libicucore.dylib:${CMAKE_BINARY_DIR}/src/external/icu/icuSources/libicucore.dylib \ 36 36 - -Wl,-dylib_file,/System/Library/Frameworks/Python.framework/Versions/2.6/Python:${CMAKE_BINARY_DIR}/src/external/python/2.6/Python-2.6.9/Python ") 36 36 + -Wl,-dylib_file,/System/Library/Frameworks/Python.framework/Versions/2.6/Python:${CMAKE_BINARY_DIR}/src/external/python/2.6/Python-2.6.9/Python \ 37 37 + -Wl,-dylib_file,/System/Library/Frameworks/Python.framework/Versions/2.7/Python:${CMAKE_BINARY_DIR}/src/external/python/2.7/Python-2.7.10/Python") 37 38 38 39 add_dependencies(${target} x86_64-apple-darwin11-ld) 39 40

+1 -1

src/CMakeLists.txt

reviewed

··· 132 132 add_subdirectory(CommonCrypto) 133 133 add_subdirectory(csu) 134 134 add_subdirectory(external/python/2.6/Python-2.6.9) 135 135 - #add_subdirectory(external/python/2.7/Python-2.7.10) 135 135 + add_subdirectory(external/python/2.7/Python-2.7.10) 136 136 #add_subdirectory(external/ruby) 137 137 add_subdirectory(external/expat) 138 138 #add_subdirectory(external/libauto)