+1

CMakeLists.txt

reviewed

··· 38 38 39 39 pkg_check_modules(libbsd REQUIRED "libbsd >= 0.4.2") 40 40 pkg_check_modules(libudev REQUIRED "libudev") 41 41 + #set(CMAKE_ASM_NASM_COMPILER "nasm") 41 42 42 43 find_package(GnustepBase REQUIRED) 43 44 find_package(GnustepCorebase REQUIRED)

+2

cmake_modules/FindLibobjc2.cmake

reviewed

··· 22 22 set(LIBOBJC2_FOUND FALSE) 23 23 endif (LIBOBJC2_INCLUDE_DIR AND LIBOBJC2_LIBRARY) 24 24 25 25 + execute_process(COMMAND gnustep-config --objc-libs OUTPUT_VARIABLE GNUSTEP_OBJC_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) 26 26 +

+1 -1

src/crash/CMakeLists.txt

reviewed

··· 19 19 ) 20 20 21 21 add_executable(crash ${crash_SRCS}) 22 22 - target_link_libraries(crash -lgnustep-base -lgnustep-gui) 22 22 + target_link_libraries(crash -lgnustep-base -lgnustep-gui ${GNUSTEP_OBJC_CFLAGS}) 23 23 24 24 install(TARGETS crash DESTINATION "libexec/darling/crash.app/") 25 25

+1 -1

src/libSystem/CMakeLists.txt

reviewed

··· 111 111 add_library(System.B.dylib SHARED ${libc_SRCS} ${bsdkern_SRCS} 112 112 ${machkern_SRCS} ${asl_SRCS} keymgr/keymgr.c) 113 113 # -luuid to make uuid_ functions available for Darwin apps 114 114 - target_link_libraries(System.B.dylib -ldl -lpthread -luuid mach-o -lrt -lssl -lbsd -l:libobjc.so.4) 114 114 + target_link_libraries(System.B.dylib -ldl -lpthread -luuid mach-o -lrt -lssl -lbsd ${GNUSTEP_OBJC_CFLAGS}) 115 115 add_dependencies(System.B.dylib mach-o) 116 116 117 117 install(TARGETS System.B.dylib DESTINATION "lib${SUFFIX}/darling")

+1 -1

src/libobjcdarwin/CMakeLists.txt

reviewed

··· 68 68 endif(NOT OBJC_ABI_2) 69 69 70 70 add_library(objc.A.dylib SHARED ${objcdarwin_SRCS}) 71 71 - target_link_libraries(objc.A.dylib -l:libobjc.so.4 -lgnustep-base util) 71 71 + target_link_libraries(objc.A.dylib -lgnustep-base util ${GNUSTEP_OBJC_CFLAGS}) 72 72 73 73 install(TARGETS objc.A.dylib DESTINATION "lib${SUFFIX}/darling") 74 74