Skip to content

Abstract platform-specific linker flags required for threading support #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Abstract platform-specific linker flags required for threading support #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/hsbench/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ if (BUILD_CHIMERA)
include_directories(${PCRE_INCLUDE_DIRS})
if(NOT WIN32)
target_link_libraries(hsbench hs chimera ${PCRE_LDFLAGS} databaseutil
expressionutil ${SQLITE3_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
expressionutil ${SQLITE3_LDFLAGS} Threads::Threads)
else()
target_link_libraries(hsbench hs chimera pcre databaseutil
expressionutil ${SQLITE3_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
expressionutil ${SQLITE3_LDFLAGS} Threads::Threads)
endif()
else()
if(WIN32 AND (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS))
Expand All @@ -72,5 +72,5 @@ else()
add_executable(hsbench ${hsbench_SOURCES})
endif()
target_link_libraries(hsbench hs databaseutil expressionutil
${SQLITE3_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
${SQLITE3_LDFLAGS} Threads::Threads)
endif()
10 changes: 3 additions & 7 deletions tools/hscheck/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,15 @@ if (BUILD_CHIMERA)
add_definitions(-DHS_HYBRID)
add_executable(hscheck ${hscheck_SOURCES})
if(NOT WIN32)
target_link_libraries(hscheck hs chimera ${PCRE_LDFLAGS} expressionutil pthread)
target_link_libraries(hscheck hs chimera ${PCRE_LDFLAGS} expressionutil Threads::Threads)
else()
target_link_libraries(hscheck hs chimera pcre expressionutil)
target_link_libraries(hscheck hs chimera pcre expressionutil Threads::Threads)
endif()
else()
if(WIN32 AND (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS))
add_executable(hscheck ${hscheck_SOURCES} $<TARGET_OBJECTS:hs_compile_shared> $<TARGET_OBJECTS:hs_exec_shared>)
else()
add_executable(hscheck ${hscheck_SOURCES})
endif()
if(NOT WIN32)
target_link_libraries(hscheck hs expressionutil pthread)
else()
target_link_libraries(hscheck hs expressionutil)
endif()
target_link_libraries(hscheck hs expressionutil Threads::Threads)
endif()