this repo has no description
1
fork

Configure Feed

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

Made the build more Debian-friendly

+148 -137
+14
Toolchain-x86.cmake
··· 1 + SET(CMAKE_SYSTEM_NAME Linux) 2 + SET(CMAKE_SYSTEM_PROCESSOR "i686") 3 + 4 + SET(CMAKE_C_COMPILER clang) 5 + SET(CMAKE_CXX_COMPILER clang++) 6 + 7 + SET(BITS 32) 8 + 9 + if (EXISTS "/etc/debian_version") 10 + SET (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}") 11 + else (EXISTS "/etc/debian_version") 12 + SET (CMAKE_INSTALL_LIBDIR "lib32") 13 + endif (EXISTS "/etc/debian_version") 14 +
+13
Toolchain-x86_64.cmake
··· 1 + SET(CMAKE_SYSTEM_NAME Linux) 2 + SET(CMAKE_SYSTEM_PROCESSOR "x86-64") 3 + 4 + SET(CMAKE_C_COMPILER clang) 5 + SET(CMAKE_CXX_COMPILER clang++) 6 + SET(BITS 64) 7 + 8 + if (EXISTS "/etc/debian_version") 9 + SET (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}") 10 + else (EXISTS "/etc/debian_version") 11 + SET (CMAKE_INSTALL_LIBDIR "lib64") 12 + endif (EXISTS "/etc/debian_version") 13 +
+2 -2
src/AppKit/CMakeLists.txt
··· 35 35 QNSEventDispatcher.mm 36 36 ) 37 37 38 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 38 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 39 39 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 40 40 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 41 41 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 44 44 target_link_libraries(AppKit -lgnustep-base -lX11) 45 45 qt5_use_modules(AppKit Declarative Widgets Quick) 46 46 47 - install(TARGETS AppKit DESTINATION "lib${SUFFIX}/darling") 47 + install(TARGETS AppKit DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 48 48
+2 -2
src/ApplicationServices/CMakeLists.txt
··· 5 5 cmake_policy(SET CMP0003 NEW) 6 6 endif(COMMAND cmake_policy) 7 7 8 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 8 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 9 9 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 10 10 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 11 11 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 13 13 add_library(ApplicationServices SHARED dummy.c) 14 14 target_link_libraries(ApplicationServices CoreServices) 15 15 16 - install(TARGETS ApplicationServices DESTINATION "lib${SUFFIX}/darling") 16 + install(TARGETS ApplicationServices DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 17 17
+2 -2
src/AudioToolbox/CMakeLists.txt
··· 24 24 AudioFile.cpp 25 25 ) 26 26 27 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 27 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 28 28 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 29 29 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 30 30 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 32 32 add_library(AudioToolbox SHARED ${AudioToolbox_SRCS}) 33 33 target_link_libraries(AudioToolbox util -lstdc++ -lavcodec -lavresample -lavformat CFF) 34 34 35 - install(TARGETS AudioToolbox DESTINATION "lib${SUFFIX}/darling") 35 + install(TARGETS AudioToolbox DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 36 36
+2 -2
src/AudioUnit/CMakeLists.txt
··· 71 71 list(APPEND SoundLibs "-lpulse") 72 72 endif (ENABLE_PULSEAUDIO) 73 73 74 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 74 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 75 75 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 76 76 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 77 77 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 79 79 add_library(AudioUnit SHARED ${AudioUnit_SRCS}) 80 80 target_link_libraries(AudioUnit -lstdc++ -lpthread ${SoundLibs} libdispatch_shared CFF) 81 81 82 - install(TARGETS AudioUnit DESTINATION "lib${SUFFIX}/darling") 82 + install(TARGETS AudioUnit DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 83 83
+2 -2
src/CFF/CMakeLists.txt
··· 20 20 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 21 21 set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") 22 22 23 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 23 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 24 24 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 25 25 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 26 26 ··· 56 56 target_link_libraries(CFFExtra CFF cxx) 57 57 58 58 59 - install(TARGETS CFF CFFExtra DESTINATION lib${SUFFIX}/darling) 59 + install(TARGETS CFF CFFExtra DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+21 -25
src/CMakeLists.txt
··· 11 11 set(DARLING_NO_EXECUTABLES OFF) 12 12 enable_language(ASM) 13 13 14 - if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") AND (${CMAKE_C_FLAGS} MATCHES ".*-m32.*")) 15 - set(CMAKE_SYSTEM_PROCESSOR "i686") 16 - 14 + if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "i686|i386") 15 + message(FATAL_ERROR "This software can only be built on x86-64 systems") 16 + endif (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "i686|i386") 17 + 18 + if (NOT BITS) 19 + message(FATAL_ERROR "BITS is not specified (32/64)") 20 + endif (NOT BITS) 21 + 22 + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m${BITS}") 23 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${BITS}") 24 + SET(CMAKE_ASM_FLAGS "-m${BITS}") 25 + SET(CMAKE_ASM-ATT_FLAGS "-m${BITS}") 26 + 27 + if (BITS EQUAL 32) 17 28 # Prevent building Darling executables (e.g. Bash) 18 29 set(DARLING_NO_EXECUTABLES ON) 19 - endif() 20 30 21 - if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 22 - set(BITS 32) 31 + SET(SUFFIX "32") 23 32 add_definitions(-DTARGET_CPU_X86=1 -D__LITTLE_ENDIAN__) 24 - set(CMAKE_SYSTEM_PROCESSOR "i686") 25 33 set(DARLING_NO_EXECUTABLES ON) 26 - else(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 27 - set(BITS 64) 34 + 35 + else() 36 + 37 + set(SUFFIX "64") 28 38 add_definitions(-DTARGET_CPU_X86_64=1 -D__LITTLE_ENDIAN__) 29 - endif(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 30 39 31 - message(STATUS "Building for ${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_C_FLAGS}") 40 + endif() 32 41 33 - if (CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 34 - set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -m32") 35 - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") 36 - # We need to add -mlong-double-128 to support long double properly. 37 - # With GCC, we could use -mlong-double-128, but Clang doesn't support that 38 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") 39 - set(CMAKE_ASM-ATT_FLAGS "-m32") 40 - set(CMAKE_ASM_FLAGS "-m32") 41 - SET(CMAKE_C_SIZEOF_DATA_PTR 4) 42 - SET(SUFFIX "32") 43 - endif(CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 44 - if (CMAKE_INSTALL_LIBDIR STREQUAL "lib64") 45 - set(SUFFIX "64") 46 - endif (CMAKE_INSTALL_LIBDIR STREQUAL "lib64") 42 + message(STATUS "Building for ${CMAKE_SYSTEM_PROCESSOR}, CFLAGS: ${CMAKE_C_FLAGS}, libdir: ${CMAKE_INSTALL_LIBDIR}") 47 43 48 44 add_definitions(-D__APPLE__ -D__DYNAMIC__) 49 45
+2 -2
src/Carbon/CMakeLists.txt
··· 16 16 #HIToolbox/MacWindows.cpp 17 17 ) 18 18 19 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 19 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 20 20 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 21 21 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 22 22 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 24 24 add_library(Carbon SHARED ${Carbon_SRCS}) 25 25 target_link_libraries(Carbon util CoreServices -lX11) 26 26 27 - install(TARGETS Carbon DESTINATION "lib${SUFFIX}/darling") 27 + install(TARGETS Carbon DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 28 28
+2 -2
src/Cocoa/CMakeLists.txt
··· 5 5 cmake_policy(SET CMP0003 NEW) 6 6 endif(COMMAND cmake_policy) 7 7 8 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 8 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 9 9 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 10 10 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 11 11 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 13 13 add_library(Cocoa SHARED zero.c) 14 14 target_link_libraries(Cocoa -lgnustep-gui CoreFoundation) 15 15 16 - install(TARGETS Cocoa DESTINATION "lib${SUFFIX}/darling") 16 + install(TARGETS Cocoa DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 17 17
+2 -2
src/CommonCrypto/CMakeLists.txt
··· 59 59 #Source/API/CommonSymmetricKeywrap.c 60 60 ) 61 61 62 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 62 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 63 63 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 64 64 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 65 65 66 66 add_library(CommonCrypto SHARED ${cc_SRCS}) 67 67 target_link_libraries(CommonCrypto system_c system_kernel) 68 68 69 - install(TARGETS CommonCrypto DESTINATION lib${SUFFIX}/darling) 69 + install(TARGETS CommonCrypto DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/CoreGraphics/CMakeLists.txt
··· 34 34 CGContext.cpp 35 35 ) 36 36 37 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 37 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 38 38 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 39 39 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 40 40 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 43 43 target_link_libraries(CoreGraphics -lopal -lgnustep-corebase -lX11 -lXrandr 44 44 -lgnustep-corebase ${QT_LIBRARIES}) 45 45 46 - install(TARGETS CoreGraphics DESTINATION "lib${SUFFIX}/darling") 46 + install(TARGETS CoreGraphics DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 47 47
+1 -1
src/CoreSecurity/CMakeLists.txt
··· 26 26 add_library(CoreSecurity SHARED ${cs_SRCS}) 27 27 target_link_libraries(CoreSecurity) 28 28 29 - install(TARGETS CoreSecurity DESTINATION "lib${SUFFIX}/darling") 29 + install(TARGETS CoreSecurity DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 30 30
+2 -2
src/CoreServices/CMakeLists.txt
··· 55 55 set(EXTRA_LIBS AudioUnit) 56 56 endif (WITH_COREAUDIO) 57 57 58 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 58 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 59 59 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 60 60 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 61 61 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 63 63 add_library(CoreServices SHARED ${CoreServices_SRCS}) 64 64 target_link_libraries(CoreServices icucore system ${EXTRA_LIBS} CFF cxx iconv) 65 65 66 - install(TARGETS CoreServices DESTINATION "lib${SUFFIX}/darling") 66 + install(TARGETS CoreServices DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 67 67 install(FILES SystemVersion.plist DESTINATION "share/darling") 68 68
+2 -2
src/CoreVideo/CMakeLists.txt
··· 17 17 CVDisplayLink.cpp 18 18 ) 19 19 20 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 20 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 21 21 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 22 22 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 23 23 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 25 25 add_library(CoreVideo SHARED ${CoreVideo_SRCS}) 26 26 target_link_libraries(CoreVideo util) 27 27 28 - install(TARGETS CoreVideo DESTINATION "lib${SUFFIX}/darling") 28 + install(TARGETS CoreVideo DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 29 29
+2 -2
src/DiskArbitration/CMakeLists.txt
··· 16 16 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 17 17 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 18 18 19 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 19 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 20 20 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 21 21 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 22 22 ··· 37 37 add_library(DiskArbitration SHARED ${da_SRCS}) 38 38 target_link_libraries(DiskArbitration PRIVATE system CFF) 39 39 40 - install(TARGETS DiskArbitration DESTINATION lib${SUFFIX}/darling) 40 + install(TARGETS DiskArbitration DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/ExceptionHandling/CMakeLists.txt
··· 16 16 ExceptionHandler.mm 17 17 ) 18 18 19 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 19 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 20 20 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 21 21 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 22 22 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 24 24 add_library(ExceptionHandling SHARED ${ExceptionHandling_SRCS}) 25 25 target_link_libraries(ExceptionHandling util Foundation) 26 26 27 - install(TARGETS ExceptionHandling DESTINATION "lib${SUFFIX}/darling") 27 + install(TARGETS ExceptionHandling DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 28 28
+2 -2
src/Foundation/CMakeLists.txt
··· 25 25 NSAppleEventManager.mm 26 26 ) 27 27 28 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 28 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 29 29 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 30 30 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 31 31 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 33 33 add_library(Foundation SHARED ${Foundation_SRCS}) 34 34 target_link_libraries(Foundation -lgnustep-base) 35 35 36 - install(TARGETS Foundation DESTINATION "lib${SUFFIX}/darling") 36 + install(TARGETS Foundation DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 37 37
+2 -2
src/IOKit/CMakeLists.txt
··· 31 31 ../util/debug.cpp 32 32 ) 33 33 34 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 34 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 35 35 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 36 36 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 37 37 38 38 add_library(IOKit SHARED ${IOKit_SRCS}) 39 39 target_link_libraries(IOKit -ludev -lstdc++ CFF) 40 40 41 - install(TARGETS IOKit DESTINATION "lib${SUFFIX}/darling") 41 + install(TARGETS IOKit DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 42 42
+2 -2
src/OpenGL/CMakeLists.txt
··· 17 17 OpenGL.cpp 18 18 ) 19 19 20 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 20 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 21 21 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 22 22 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 23 23 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 25 25 add_library(OpenGL SHARED ${OpenGL_SRCS}) 26 26 target_link_libraries(OpenGL util -lGL) 27 27 28 - install(TARGETS OpenGL DESTINATION "lib${SUFFIX}/darling") 28 + install(TARGETS OpenGL DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 29 29
+1 -1
src/SystemConfiguration/CMakeLists.txt
··· 25 25 add_library(SystemConfiguration SHARED ${SystemConfiguration_SRCS}) 26 26 target_link_libraries(SystemConfiguration -lgnustep-corebase) 27 27 28 - install(TARGETS SystemConfiguration DESTINATION "lib${SUFFIX}/darling") 28 + install(TARGETS SystemConfiguration DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 29 29
+2 -2
src/VideoDecodeAcceleration/CMakeLists.txt
··· 16 16 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 17 17 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 18 18 19 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 19 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 20 20 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 21 21 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 22 22 ··· 35 35 add_library(VideoDecodeAcceleration SHARED ${vda_SRCS}) 36 36 target_link_libraries(VideoDecodeAcceleration PRIVATE system CFF) 37 37 38 - install(TARGETS VideoDecodeAcceleration DESTINATION lib${SUFFIX}/darling) 38 + install(TARGETS VideoDecodeAcceleration DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/copyfile/CMakeLists.txt
··· 19 19 # xattr_flags.c # Doesn't build yet (XPC) 20 20 ) 21 21 22 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 22 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 23 23 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 24 24 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 25 25 26 26 add_library(system_copyfile SHARED ${copyfile_sources}) 27 27 target_link_libraries(system_copyfile system_kernel system_c) 28 28 29 - install(TARGETS system_copyfile DESTINATION lib${SUFFIX}/darling) 29 + install(TARGETS system_copyfile DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+1 -1
src/darling-config.h.in
··· 1 1 #ifndef CONFIG_H 2 2 #define CONFIG_H 3 3 4 - #define LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib@SUFFIX@/darling" 4 + #define LIB_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling" 5 5 #define LIBEXEC_PATH "${CMAKE_INSTALL_PREFIX}/libexec/darling" 6 6 #define LIB_DIR_NAME "lib@SUFFIX@" 7 7 #define INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
+2 -2
src/duct/src/CMakeLists.txt
··· 18 18 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 19 19 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--unresolved-symbols=ignore-all -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 20 20 21 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 21 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 22 22 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 23 23 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 24 24 ··· 26 26 CRGetCrashLogMessage.c acl.c bootstrap.c dyld.c dns_sd.c 27 27 sa_dst_compare.c asl.c) 28 28 29 - install(TARGETS system_duct DESTINATION lib${SUFFIX}/darling) 29 + install(TARGETS system_duct DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+1 -1
src/dyld/CMakeLists.txt
··· 14 14 ) 15 15 16 16 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -ggdb -O0") 17 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 17 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 18 18 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 19 19 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 20 20 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+2 -14
src/kernel/CMakeLists.txt
··· 12 12 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__DARWIN_UNIX03 -fPIC -w -nostdinc") 13 13 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/darwin.map") 14 14 15 - if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 16 - set(BITS 32) 17 - add_definitions(-DTARGET_CPU_X86=1) 18 - else(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 19 - set(BITS 64) 20 - add_definitions(-DTARGET_CPU_X86_64=1) 21 - endif(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 22 - 23 15 include_directories(${DARLING_TOP_DIRECTORY}/kernel-include) 24 16 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 25 17 ··· 30 22 add_subdirectory(libsyscall) 31 23 add_subdirectory(mach_server/client) 32 24 33 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 25 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 34 26 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 35 27 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 36 - 37 - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") 38 - # set (extra_objs $<TARGET_OBJECTS:libsyscall_legacy_extra>) 39 - endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") 40 28 41 29 add_library(system_kernel SHARED 42 30 $<TARGET_OBJECTS:libsyscall> ··· 46 34 $<TARGET_OBJECTS:mach_server_client>) 47 35 target_link_libraries(system_kernel system_duct) 48 36 49 - install(TARGETS system_kernel DESTINATION lib${SUFFIX}/darling) 37 + install(TARGETS system_kernel DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 50 38 51 39 add_dependencies(system_kernel migcom)
+2 -2
src/keymgr/CMakeLists.txt
··· 24 24 keymgr.c 25 25 ) 26 26 27 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 27 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 28 28 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 29 29 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 30 30 31 31 add_library(keymgr SHARED ${keymgr_sources}) 32 32 33 - install(TARGETS keymgr DESTINATION lib${SUFFIX}/darling) 33 + install(TARGETS keymgr DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/launchd/liblaunch/CMakeLists.txt
··· 24 24 ${CMAKE_CURRENT_BINARY_DIR}/helperServer.c 25 25 ) 26 26 27 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 27 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 28 28 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 29 29 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 30 30 31 31 add_library(launch SHARED ${launch_sources}) 32 32 target_link_libraries(launch system_c system_kernel) 33 33 34 - install(TARGETS launch DESTINATION lib${SUFFIX}/darling) 34 + install(TARGETS launch DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 35 35
+1 -1
src/launchd/src/CMakeLists.txt
··· 48 48 #${CMAKE_CURRENT_BINARY_DIR}/job_typesUser.c 49 49 ) 50 50 51 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 51 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 52 52 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 53 53 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 54 54
+3 -3
src/libc/CMakeLists.txt
··· 83 83 ) 84 84 endif() 85 85 86 - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") 86 + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86.64") 87 87 add_subdirectory(x86_64) 88 88 endif() 89 89 90 90 add_subdirectory(darwin) 91 91 92 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 92 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 93 93 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 94 94 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 95 95 ··· 134 134 ${extra_objs}) 135 135 target_link_libraries(system_c system_kernel system_m) 136 136 137 - install(TARGETS system_c DESTINATION lib${SUFFIX}/darling) 137 + install(TARGETS system_c DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 138 138 139 139 # TODO: see ./xcodescripts/variants.xcconfig 140 140
+1 -1
src/libcrashhandler/CMakeLists.txt
··· 16 16 add_library(crashhandler SHARED ${crashhandler_src}) 17 17 target_link_libraries(crashhandler -lgnustep-gui -lgnustep-base) 18 18 19 - install(TARGETS crashhandler DESTINATION "lib${SUFFIX}/darling") 19 + install(TARGETS crashhandler DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 20 20
+2 -2
src/libdyld/CMakeLists.txt
··· 59 59 60 60 #endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86") 61 61 62 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 62 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 63 63 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 64 64 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 65 65 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 69 69 add_library(dyld SHARED ${dyld_SRCS}) 70 70 target_link_libraries(dyld PRIVATE -ldl -lpthread mach-o darling-util) 71 71 72 - install(TARGETS dyld DESTINATION lib${SUFFIX}/darling) 72 + install(TARGETS dyld DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 73 73 74 74
+2 -2
src/libedit/CMakeLists.txt
··· 14 14 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 15 15 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 16 16 17 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 17 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 18 18 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 19 19 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 20 20 ··· 59 59 add_library(edit SHARED ${edit_SRCS}) 60 60 target_link_libraries(edit PRIVATE system ncurses) 61 61 62 - install(TARGETS edit DESTINATION lib${SUFFIX}/darling) 62 + install(TARGETS edit DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/libffi/CMakeLists.txt
··· 17 17 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 18 18 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 19 19 20 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 20 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 21 21 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 22 22 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 23 23 ··· 35 35 add_library(ffi SHARED ${ffi_SRCS}) 36 36 target_link_libraries(ffi system) 37 37 38 - install(TARGETS ffi DESTINATION lib${SUFFIX}/darling) 38 + install(TARGETS ffi DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/libgcc/CMakeLists.txt
··· 13 13 dummy.c 14 14 ) 15 15 16 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 16 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 17 17 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 18 18 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 19 19 20 20 add_library(gcc_s SHARED ${libgcc_sources}) 21 21 target_link_libraries(gcc_s compiler_rt) 22 22 23 - install(TARGETS gcc_s DESTINATION lib${SUFFIX}/darling) 23 + install(TARGETS gcc_s DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+3 -3
src/libiconv/CMakeLists.txt
··· 23 23 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w -include ${CMAKE_CURRENT_BINARY_DIR}/include.h -O0 -ggdb") 24 24 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 25 25 26 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 26 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 27 27 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 28 28 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 29 29 ··· 68 68 ) 69 69 target_link_libraries(iconv system) 70 70 71 - install(TARGETS iconv DESTINATION lib${SUFFIX}/darling) 72 - install(FILES charset.alias DESTINATION lib${SUFFIX}/darling) 71 + install(TARGETS iconv DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 72 + install(FILES charset.alias DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/libinfo/CMakeLists.txt
··· 29 29 add_subdirectory(membership.subproj) 30 30 add_subdirectory(darling-resolver) 31 31 32 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 32 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 33 33 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 34 34 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 35 35 ··· 44 44 ) 45 45 target_link_libraries(system_info system_c resolv-darwin) 46 46 47 - install(TARGETS system_info DESTINATION lib${SUFFIX}/darling) 47 + install(TARGETS system_info DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/libm/CMakeLists.txt
··· 141 141 142 142 ) 143 143 144 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 144 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 145 145 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 146 146 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 147 147 ··· 150 150 151 151 add_library(system_m SHARED ${libm_sources} $<TARGET_OBJECTS:system_m_extra>) 152 152 153 - install(TARGETS system_m DESTINATION lib${SUFFIX}/darling) 153 + install(TARGETS system_m DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 154 154
+1 -1
src/libmach-o/CMakeLists.txt
··· 25 25 set_target_properties(mach-o PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") 26 26 target_link_libraries(mach-o -ldl -lpthread darling-util) 27 27 28 - install(TARGETS mach-o DESTINATION "lib${SUFFIX}/darling") 28 + install(TARGETS mach-o DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 29 29
+2 -2
src/libmalloc/CMakeLists.txt
··· 32 32 src/stack_logging_disk.c 33 33 ) 34 34 35 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 35 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 36 36 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 37 37 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 38 38 39 39 add_library(system_malloc SHARED ${libmalloc_sources}) 40 40 41 - install(TARGETS system_malloc DESTINATION lib${SUFFIX}/darling) 41 + install(TARGETS system_malloc DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 42 42
+2 -2
src/libnotify/CMakeLists.txt
··· 22 22 ${CMAKE_CURRENT_BINARY_DIR}/notify_ipcUser.c 23 23 ) 24 24 25 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 25 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 26 26 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 27 27 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 28 28 29 29 add_library(system_notify SHARED ${notify_sources}) 30 30 target_link_libraries(system_notify system_c system_kernel) 31 31 32 - install(TARGETS system_notify DESTINATION lib${SUFFIX}/darling) 32 + install(TARGETS system_notify DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 33 33
+2 -2
src/libremovefile/CMakeLists.txt
··· 17 17 removefile_tree_walker.c 18 18 ) 19 19 20 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 20 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 21 21 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 22 22 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 23 23 24 24 add_library(removefile SHARED ${removefile_sources}) 25 25 target_link_libraries(removefile system_c system_kernel) 26 26 27 - install(TARGETS removefile DESTINATION lib${SUFFIX}/darling) 27 + install(TARGETS removefile DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 28 28
+2 -2
src/libresolv/CMakeLists.txt
··· 44 44 dnsinfo/dnsinfo.c 45 45 ) 46 46 47 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 47 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 48 48 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 49 49 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 50 50 51 51 add_library(resolv-darwin SHARED ${resolv_sources}) 52 52 target_link_libraries(resolv-darwin system_c system_kernel) 53 53 54 - install(TARGETS resolv-darwin DESTINATION lib${SUFFIX}/darling) 54 + install(TARGETS resolv-darwin DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 55 55
+2 -2
src/libstdcxx/CMakeLists.txt
··· 92 92 src/dso_handle.c 93 93 ) 94 94 95 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 95 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 96 96 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 97 97 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 98 98 99 99 add_library(stdcxx SHARED ${libstdcxx_sources}) 100 100 target_link_libraries(stdcxx cxxabi_shared) 101 101 102 - install(TARGETS stdcxx DESTINATION lib${SUFFIX}/darling) 102 + install(TARGETS stdcxx DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 103 103
+2 -2
src/libsystem/CMakeLists.txt
··· 32 32 libmacho/arch.c 33 33 ) 34 34 35 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 35 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 36 36 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 37 37 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 38 38 ··· 42 42 system_m system_info system_notify libdispatch_shared objc launch 43 43 removefile system_copyfile unwind system_coreservices CommonCrypto) 44 44 45 - install(TARGETS system DESTINATION lib${SUFFIX}/darling) 45 + install(TARGETS system DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 46 46
+2 -2
src/libsystem_coreservices/CMakeLists.txt
··· 17 17 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 18 18 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--unresolved-symbols=ignore-all -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") 19 19 20 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 20 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 21 21 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 22 22 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 23 23 24 24 add_library(system_coreservices SHARED dirhelper.c NSSystemDirectories.c) 25 25 target_link_libraries(system_coreservices PRIVATE system_c) 26 26 27 - install(TARGETS system_coreservices DESTINATION lib${SUFFIX}/darling) 27 + install(TARGETS system_coreservices DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/libunwind/CMakeLists.txt
··· 32 32 src/Unwind-sjlj.c 33 33 ) 34 34 35 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 35 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 36 36 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 37 37 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 38 38 ··· 40 40 target_link_libraries(unwind system_c) 41 41 set_target_properties(unwind PROPERTIES LINKER_LANGUAGE C) 42 42 43 - install(TARGETS unwind DESTINATION lib${SUFFIX}/darling) 43 + install(TARGETS unwind DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/libutil/CMakeLists.txt
··· 26 26 wipefs.cpp 27 27 ) 28 28 29 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 29 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 30 30 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 31 31 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 32 32 33 33 add_library(util SHARED ${util_SRCS}) 34 34 target_link_libraries(util system) 35 35 36 - install(TARGETS util DESTINATION lib${SUFFIX}/darling) 36 + install(TARGETS util DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+1 -1
src/motool/CMakeLists.txt
··· 14 14 motool.cpp 15 15 ) 16 16 17 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 17 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 18 18 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 19 19 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 20 20 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+2 -2
src/ncurses/menu/CMakeLists.txt
··· 37 37 m_win.c 38 38 ) 39 39 40 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 40 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 41 41 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 42 42 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 43 43 44 44 add_library(menu SHARED ${menu_sources}) 45 45 target_link_libraries(menu system) 46 46 47 - install(TARGETS menu DESTINATION lib${SUFFIX}/darling) 47 + install(TARGETS menu DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/ncurses/ncurses/CMakeLists.txt
··· 189 189 base/fallback.c 190 190 ) 191 191 192 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 192 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 193 193 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 194 194 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 195 195 196 196 add_library(ncurses SHARED ${ncurses_sources}) 197 197 target_link_libraries(ncurses system) 198 198 199 - install(TARGETS ncurses DESTINATION lib${SUFFIX}/darling) 199 + install(TARGETS ncurses DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/ncurses/panel/CMakeLists.txt
··· 23 23 p_win.c 24 24 ) 25 25 26 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 26 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 27 27 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 28 28 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 29 29 30 30 add_library(panel SHARED ${panel_sources}) 31 31 target_link_libraries(panel system) 32 32 33 - install(TARGETS panel DESTINATION lib${SUFFIX}/darling) 33 + install(TARGETS panel DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)
+2 -2
src/thin/CMakeLists.txt
··· 5 5 cmake_policy(SET CMP0003 NEW) 6 6 endif(COMMAND cmake_policy) 7 7 8 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 8 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 9 9 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 10 10 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 11 11 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ··· 17 17 add_library(auto SHARED) 18 18 SET_TARGET_PROPERTIES(auto PROPERTIES LINKER_LANGUAGE C) 19 19 20 - install(TARGETS AppKit auto DESTINATION "lib${SUFFIX}/darling") 20 + install(TARGETS AppKit auto DESTINATION "${CMAKE_INSTALL_LIBDIR}/darling") 21 21
+2 -2
src/util/CMakeLists.txt
··· 15 15 leb.cpp 16 16 ) 17 17 18 - #SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 18 + #SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 19 19 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags") 20 20 #SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 21 21 #SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 22 22 23 23 add_library(darling-util ${util-SRCS}) 24 24 set_target_properties(darling-util PROPERTIES COMPILE_FLAGS "-fPIC") 25 - #install(TARGETS darling-util DESTINATION lib${SUFFIX}/darling) 25 + #install(TARGETS darling-util DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling) 26 26
+2 -2
src/xar/CMakeLists.txt
··· 46 46 lib/zxar.c 47 47 ) 48 48 49 - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") 49 + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/darling") 50 50 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 51 51 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 52 52 53 53 add_library(xar SHARED ${xar_SRCS}) 54 54 target_link_libraries(xar system z bz2 xml2 ssl098 crypto098) 55 55 56 - install(TARGETS xar DESTINATION lib${SUFFIX}/darling) 56 + install(TARGETS xar DESTINATION ${CMAKE_INSTALL_LIBDIR}/darling)