Skip to content

Commit 1a228d8

Browse files
minusbatdavidchisnall
authored andcommitted
Make detection of robin_map work for static as well as shared libraries
This rmeoves the clunky insretion of /usr/local/include, which was my prevuous fix. It nwo works the same way for static as it does for dynamic.
1 parent b977f5a commit 1a228d8

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ add_compile_definitions($<$<BOOL:${STRICT_APPLE_COMPATIBILITY}>:STRICT_APPLE_COM
155155

156156
configure_file(objc/objc-config.h.in objc/objc-config.h @ONLY)
157157
include_directories("${PROJECT_BINARY_DIR}/objc/")
158-
if (IS_DIRECTORY /usr/local/include)
159-
include_directories("/usr/local/include")
160-
endif()
161158

162159
if (EMBEDDED_BLOCKS_RUNTIME)
163160
list(APPEND libobjc_ASM_SRCS block_trampolines.S)
@@ -304,6 +301,7 @@ if (BUILD_STATIC_LIBOBJC)
304301
add_library(objc-static STATIC ${libobjc_C_SRCS} ${libobjc_ASM_SRCS} ${libobjc_OBJC_SRCS} ${libobjc_OBJCXX_SRCS} ${libobjc_CXX_SRCS})
305302
target_compile_options(objc-static PRIVATE "$<$<OR:$<COMPILE_LANGUAGE:OBJC>,$<COMPILE_LANGUAGE:OBJCXX>>:-Wno-gnu-folding-constant;-Wno-deprecated-objc-isa-usage;-Wno-objc-root-class;-fobjc-runtime=gnustep-2.0>$<$<COMPILE_LANGUAGE:C>:-Xclang;-fexceptions;-Wno-gnu-folding-constant>")
306303
target_compile_features(objc-static PRIVATE cxx_std_20)
304+
target_link_libraries(objc-static PRIVATE tsl::robin_map)
307305
set_target_properties(objc-static PROPERTIES
308306
POSITION_INDEPENDENT_CODE true
309307
OUTPUT_NAME ${LIBOBJC_NAME})

0 commit comments

Comments
 (0)