Skip to content

Commit bf5a1ac

Browse files
committed
Fix in written config file in case there's no dynamic lib
1 parent bfaa44e commit bf5a1ac

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/CMakeLists.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,13 @@ install(FILES ${HEADERS} DESTINATION include/jthread)
4848
install(TARGETS ${JTHREAD_INSTALLTARGETS} DESTINATION ${LIBRARY_INSTALL_DIR})
4949

5050
if (UNIX)
51-
get_target_property(JTHREAD_LOCAL_LIBRARY_NAME jthread-shared LOCATION)
52-
get_filename_component(JTHREAD_LIBNAME "${JTHREAD_LOCAL_LIBRARY_NAME}" NAME)
53-
set(JTHREAD_LIBS "${LIBRARY_INSTALL_DIR}/${JTHREAD_LIBNAME}" ${CMAKE_THREAD_LIBS_INIT})
51+
if (NOT JTHREAD_COMPILE_STATIC_ONLY)
52+
get_target_property(JTHREAD_LOCAL_LIBRARY_NAME jthread-shared LOCATION)
53+
get_filename_component(JTHREAD_LIBNAME "${JTHREAD_LOCAL_LIBRARY_NAME}" NAME)
54+
set(JTHREAD_LIBS "${LIBRARY_INSTALL_DIR}/${JTHREAD_LIBNAME}" ${CMAKE_THREAD_LIBS_INIT})
55+
else()
56+
set(JTHREAD_LIBS "-L${LIBRARY_INSTALL_DIR}" "-ljthread" ${CMAKE_THREAD_LIBS_INIT})
57+
endif()
5458
else (UNIX)
5559
if (JTHREAD_COMPILE_STATIC)
5660
get_target_property(JTHREAD_LOCAL_LIBRARY_NAME jthread-static RELEASE_LOCATION)

0 commit comments

Comments
 (0)