overby.me / darling-nix
this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Use different reexport style

The old one couldn't work under the limitations of CMake

Andrew Hyatt 36245caa dc16bd2a

+91 -44
+2
CMakeLists.txt
··· 1 1 SET(CMAKE_SYSTEM_NAME Linux) 2 2 SET(CMAKE_SYSTEM_PROCESSOR "x86-64") 3 3 4 + 5 + 4 6 # This allows setting the compiler with -DCMAKE_C_COMPILER when configuring. 5 7 if (NOT DEFINED CMAKE_C_COMPILER) 6 8 find_program(CMAKE_C_COMPILER NAMES
+2
cmake/darling_lib.cmake
··· 20 20 SUFFIX ".dylib" 21 21 NO_SONAME TRUE) 22 22 23 + set_target_properties(${name} PROPERTIES PREFIX "lib") 24 + 23 25 set_property(TARGET ${name} APPEND_STRING PROPERTY 24 26 LINK_FLAGS " ${CMAKE_SHARED_LINKER_FLAGS} -nostdlib") 25 27
+43 -19
cmake/use_ld64.cmake
··· 1 - set(dylib_paths "") 2 1 FUNCTION(use_ld64 target) 3 - get_property(ld_dylib_paths GLOBAL PROPERTY ld_dylib_paths) 4 2 set_property(TARGET ${target} APPEND_STRING PROPERTY 5 3 LINK_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ld64/src/ \ 6 4 -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ \ ··· 59 57 -Wl,-dylib_file,/usr/lib/libcrypto.0.9.8.dylib:${CMAKE_BINARY_DIR}/src/external/openssl/src/libcrypto.0.9.8.dylib \ 60 58 -Wl,-dylib_file,/usr/lib/native/libGL.dylib:${CMAKE_BINARY_DIR}/src/native/libGL.dylib \ 61 59 -Wl,-dylib_file,/System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage:${CMAKE_BINARY_DIR}/src/CoreImage/CoreImage \ 62 - -Wl,-dylib_file,/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo:${CMAKE_BINARY_DIR}/src/CoreVideo/CoreVideo \ 63 - ${ld_dylib_paths}") 60 + -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents:${CMAKE_BINARY_DIR}/src/CoreServices/FSEvents \ 61 + -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices:${CMAKE_BINARY_DIR}/src/CoreServices/LaunchServices \ 62 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib\ 63 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/vMisc/libvMisc.dylib \ 64 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib\ 65 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/vDSP/libvDSP.dylib \ 66 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib\ 67 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/BLAS/libBLAS.dylib \ 68 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib\ 69 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/LAPACK/libLAPACK.dylib \ 70 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib\ 71 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/LinearAlgebra/libLinearAlgebra.dylib \ 72 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparseBLAS.dylib\ 73 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/SparseBLAS/libSparseBLAS.dylib \ 74 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libQuadrature.dylib\ 75 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/Quadrature/libQuadrature.dylib \ 76 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBNNS.dylib\ 77 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/BNNS/libBNNS.dylib \ 78 + -Wl,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparse.dylib\ 79 + :${CMAKE_BINARY_DIR}/src/Accelerate/vecLib/Sparse/libSparse.dylib \ 80 + -Wl,-dylib_file,/System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync:${CMAKE_BINARY_DIR}/src/ColorSync/ColorSync \ 81 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS\ 82 + :${CMAKE_BINARY_DIR}/src/ApplicationServices/ATS/ATS \ 83 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy\ 84 + :${CMAKE_BINARY_DIR}/src/ApplicationServices/ColorSyncLegacy/ColorSyncLegacy \ 85 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices\ 86 + :${CMAKE_BINARY_DIR}/src/ApplicationServices/HIServices/HIServices \ 87 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis\ 88 + :${CMAKE_BINARY_DIR}/src/ApplicationServices/LangAnalysis/LangAnalysis \ 89 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore\ 90 + :${CMAKE_BINARY_DIR}/src/ApplicationServices/PrintCore/PrintCore \ 91 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD\ 92 + :${CMAKE_BINARY_DIR}/src/ApplicationServices/QD/QD \ 93 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis\ 94 + :${CMAKE_BINARY_DIR}/src/ApplicationServices/SpeechSynthesis/SpeechSynthesis \ 95 + -Wl,-dylib_file,/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices:${CMAKE_BINARY_DIR}/src/CoreServices/CoreServices \ 96 + -Wl,-dylib_file,/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices:${CMAKE_BINARY_DIR}/src/ApplicationServices/ApplicationServices \ 97 + -Wl,-dylib_file,/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics:${CMAKE_BINARY_DIR}/src/external/cocotron/CoreGraphics/CoreGraphics \ 98 + -Wl,-dylib_file,/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText:${CMAKE_BINARY_DIR}/src/external/cocotron/CoreText/CoreText \ 99 + -Wl,-dylib_file,/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO:${CMAKE_BINARY_DIR}/src/ImageIO/ImageIO \ 100 + -Wl,-dylib_file,/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo:${CMAKE_BINARY_DIR}/src/CoreVideo/CoreVideo") 64 101 65 102 add_dependencies(${target} x86_64-apple-darwin11-ld) 66 103 67 104 ENDFUNCTION(use_ld64) 68 105 69 - function(reexport reexporter reexportee) 106 + function(reexport reexporter reexportee reexportee_output) 70 107 add_dependencies(${reexporter} ${reexportee}) 71 - set(reexportee_binary_dir "$<TARGET_PROPERTY:${reexportee},BINARY_DIR>") 72 - set(reexportee_output_name "$<TARGET_PROPERTY:${reexportee},OUTPUT_NAME>") 73 - #message("binary dir: ${reexportee_binary_dir}, output name: ${reexportee_output_name}") 74 - if(NOT DEFINED reexportee_output_name) 75 - set(reexportee_output_name "$<TARGET_PROPERTY:${reexportee},DYLIB_BUILD_NAME>") 76 - if(NOT DEFINED reexportee_output_name) 77 - message(FATAL_ERROR "failed to get reexportee path") 78 - endif(NOT DEFINED reexportee_output_name) 79 - endif(NOT DEFINED reexportee_output_name) 80 - set(reexportee_output "${reexportee_binary_dir}/${reexportee_output_name}") 81 - set(reexportee_install_name "$<TARGET_PROPERTY:${reexportee},DYLIB_INSTALL_NAME>") 82 - set_property(TARGET ${reexporter} APPEND PROPERTY 83 - LINK_OPTIONS " -Wl,-reexport_library,${reexportee_output} ") 84 - #set_property(GLOBAL APPEND_STRING PROPERTY ld_dylib_paths " -Wl,-dylib_file,${reexportee_install_name}:${reexportee_output} ") 108 + set_property(TARGET ${reexporter} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-reexport_library,${reexportee_output} ") 85 109 endfunction(reexport)
+2 -1
src/Accelerate/CMakeLists.txt
··· 16 16 DEPENDENCIES 17 17 system 18 18 ) 19 - reexport(Accelerate vecLib) 19 + 20 + reexport(Accelerate vecLib ${CMAKE_CURRENT_BINARY_DIR}/vecLib/vecLib)
+10 -9
src/Accelerate/vecLib/CMakeLists.txt
··· 45 45 Sparse 46 46 system 47 47 ) 48 - reexport(vecLib vMisc) 49 - reexport(vecLib vDSP) 50 - reexport(vecLib BLAS) 51 - reexport(vecLib LAPACK) 52 - reexport(vecLib LinearAlgebra) 53 - reexport(vecLib SparseBLAS) 54 - reexport(vecLib Quadrature) 55 - reexport(vecLib BNNS) 56 - reexport(vecLib Sparse) 48 + 49 + reexport(vecLib vMisc ${CMAKE_CURRENT_BINARY_DIR}/vMisc/libvMisc.dylib) 50 + reexport(vecLib vDSP ${CMAKE_CURRENT_BINARY_DIR}/vDSP/libvDSP.dylib) 51 + reexport(vecLib BLAS ${CMAKE_CURRENT_BINARY_DIR}/BLAS/libBLAS.dylib) 52 + reexport(vecLib LAPACK ${CMAKE_CURRENT_BINARY_DIR}/LAPACK/libLAPACK.dylib) 53 + reexport(vecLib LinearAlgebra ${CMAKE_CURRENT_BINARY_DIR}/LinearAlgebra/libLinearAlgebra.dylib) 54 + reexport(vecLib SparseBLAS ${CMAKE_CURRENT_BINARY_DIR}/SparseBLAS/libSparseBLAS.dylib) 55 + reexport(vecLib Quadrature ${CMAKE_CURRENT_BINARY_DIR}/Quadrature/libQuadrature.dylib) 56 + reexport(vecLib BNNS ${CMAKE_CURRENT_BINARY_DIR}/BNNS/libBNNS.dylib) 57 + reexport(vecLib Sparse ${CMAKE_CURRENT_BINARY_DIR}/Sparse/libSparse.dylib) 57 58 58 59 InstallSymlink(Accelerate.framework/Versions/A/Frameworks/vecLib.framework ${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/Frameworks/vecLib.framework)
+25 -12
src/ApplicationServices/CMakeLists.txt
··· 20 20 system CoreServices CoreFoundation 21 21 ) 22 22 23 - reexport(ApplicationServices CoreGraphics) 24 - reexport(ApplicationServices CoreText) 25 - reexport(ApplicationServices ImageIO) 26 - reexport(ApplicationServices ColorSync) 27 - reexport(ApplicationServices ATS) 28 - reexport(ApplicationServices ColorSyncLegacy) 29 - reexport(ApplicationServices CoreServices) 30 - reexport(ApplicationServices HIServices) 31 - reexport(ApplicationServices LangAnalysis) 32 - reexport(ApplicationServices PrintCore) 33 - reexport(ApplicationServices QD) 34 - reexport(ApplicationServices SpeechSynthesis) 23 + set(CoreGraphics_BUILD ${CMAKE_BINARY_DIR}/src/external/cocotron/CoreGraphics/CoreGraphics) 24 + set(CoreText_BUILD ${CMAKE_BINARY_DIR}/src/external/cocotron/CoreText/CoreText) 25 + set(CoreServices_BUILD ${CMAKE_BINARY_DIR}/src/CoreServices/CoreServices) 26 + set(ImageIO_BUILD ${CMAKE_BINARY_DIR}/src/ImageIO/ImageIO) 27 + set(ColorSync_BUILD ${CMAKE_BINARY_DIR}/src/ColorSync/ColorSync) 28 + set(ATS_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/ATS/ATS) 29 + set(ColorSyncLegacy_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/ColorSyncLegacy/ColorSyncLegacy) 30 + set(HIServices_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/HIServices/HIServices) 31 + set(LangAnalysis_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/LangAnalysis/LangAnalysis) 32 + set(PrintCore_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/PrintCore/PrintCore) 33 + set(QD_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/QD/QD) 34 + set(SpeechSynthesis_BUILD ${CMAKE_BINARY_DIR}/src/ApplicationServices/SpeechSynthesis/SpeechSynthesis) 35 + 36 + reexport(ApplicationServices CoreGraphics ${CoreGraphics_BUILD}) 37 + reexport(ApplicationServices CoreText ${CoreText_BUILD}) 38 + reexport(ApplicationServices ImageIO ${ImageIO_BUILD}) 39 + reexport(ApplicationServices ColorSync ${ColorSync_BUILD}) 40 + reexport(ApplicationServices ATS ${ATS_BUILD}) 41 + reexport(ApplicationServices ColorSyncLegacy ${ColorSyncLegacy_BUILD}) 42 + reexport(ApplicationServices CoreServices ${CoreServices_BUILD}) 43 + reexport(ApplicationServices HIServices ${HIServices_BUILD}) 44 + reexport(ApplicationServices LangAnalysis ${LangAnalysis_BUILD}) 45 + reexport(ApplicationServices PrintCore ${PrintCore_BUILD}) 46 + reexport(ApplicationServices QD ${QD_BUILD}) 47 + reexport(ApplicationServices SpeechSynthesis ${SpeechSynthesis_BUILD}) 35 48 36 49 InstallSymlink(../../../../ColorSync.framework 37 50 ${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework)
+1
src/ApplicationServices/LangAnalysis/CMakeLists.txt
··· 7 7 FAT 8 8 CURRENT_VERSION 9 9 VERSION "A" 10 + PARENT ApplicationServices 10 11 11 12 SOURCES 12 13 src/LangAnalysis.c
+6 -3
src/CoreServices/CMakeLists.txt
··· 100 100 ${EXTRA_LIBS} 101 101 ) 102 102 103 - reexport(CoreServices FSEvents) 104 - reexport(CoreServices LaunchServices) 105 - reexport(CoreServices CFNetwork) 103 + set(FSEvents_BUILD ${CMAKE_BINARY_DIR}/src/CoreServices/FSEvents) 104 + set(LaunchServices_BUILD ${CMAKE_BINARY_DIR}/src/CoreServices/LaunchServices) 105 + set(CFNetwork_BUILD ${CMAKE_BINARY_DIR}/src/external/cfnetwork/src/CFNetwork) 106 + reexport(CoreServices FSEvents ${FSEvents_BUILD}) 107 + reexport(CoreServices LaunchServices ${LaunchServices_BUILD}) 108 + reexport(CoreServices CFNetwork ${CFNetwork_BUILD}) 106 109 107 110 install(FILES SystemVersion.plist DESTINATION "libexec/darling/System/Library/CoreServices") 108 111