File tree Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -21,6 +21,10 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
21
21
include (CheckFileOffsetBits )
22
22
include (CTest )
23
23
include (FindAsan )
24
+ if (CMARK_THREADING )
25
+ set (THREADS_PREFER_PTHREAD_FLAG YES )
26
+ include (FindThreads )
27
+ endif ()
24
28
include (GNUInstallDirs )
25
29
26
30
if (NOT MSVC OR CMAKE_HOST_SYSTEM_NAME STREQUAL Windows )
Original file line number Diff line number Diff line change @@ -58,6 +58,8 @@ if (CMARK_SHARED)
58
58
target_include_directories (${LIBRARY} PUBLIC
59
59
$< BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /src/include>
60
60
$< BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /extensions/include> )
61
+ target_link_libraries (${LIBRARY} PRIVATE
62
+ $< $< BOOL:${THREADS_FOUND} > :Threads::Threads> )
61
63
62
64
# Include minor version and patch level in soname for now.
63
65
set_target_properties (${LIBRARY} PROPERTIES
@@ -81,6 +83,8 @@ if (CMARK_STATIC)
81
83
target_include_directories (${LIBRARY} PUBLIC
82
84
$< BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /src/include>
83
85
$< BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /extensions/include> )
86
+ target_link_libraries (${STATICLIBRARY} PRIVATE
87
+ $< $< BOOL:${Threads_FOUND} > :Threads::Threads> )
84
88
85
89
set_target_properties (${STATICLIBRARY} PROPERTIES
86
90
POSITION_INDEPENDENT_CODE ON )
@@ -145,16 +149,6 @@ if(CMARK_SHARED OR CMARK_STATIC)
145
149
146
150
set (CMARK_TARGETS_FILE ${CMAKE_CURRENT_BINARY_DIR} /cmarkTargets.cmake )
147
151
export (TARGETS ${CMARK_INSTALL} FILE ${CMARK_TARGETS_FILE} )
148
-
149
- if (CMARK_THREADING AND NOT APPLE AND NOT MSVC AND NOT ANDROID )
150
- if (CMARK_SHARED )
151
- target_link_libraries (${LIBRARY} pthread )
152
- endif (CMARK_SHARED )
153
-
154
- if (CMARK_STATIC )
155
- target_link_libraries (${STATICLIBRARY} pthread )
156
- endif (CMARK_STATIC )
157
- endif ()
158
152
endif ()
159
153
160
154
CONFIGURE_FILE (
You can’t perform that action at this time.
0 commit comments