Skip to content
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

Jump to bottom

support making chimera without pcre source code #223

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

support making chimera without pcre source code #223

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ if (NOT CORRECT_PCRE_VERSION)
endif()

# we need static libs for Chimera - too much deep magic for shared libs
if (CORRECT_PCRE_VERSION AND PCRE_BUILD_SOURCE AND BUILD_STATIC_LIBS)
if (CORRECT_PCRE_VERSION AND BUILD_STATIC_LIBS AND (PCRE_FOUND OR PCRE_BUILD_SOURCE))
set(BUILD_CHIMERA TRUE)
endif()

Expand Down Expand Up @@ -516,7 +516,7 @@ if (NOT CORRECT_PCRE_VERSION)
endif()

# we need static libs for Chimera - too much deep magic for shared libs
if (CORRECT_PCRE_VERSION AND PCRE_BUILD_SOURCE AND BUILD_STATIC_LIBS)
if (CORRECT_PCRE_VERSION AND BUILD_STATIC_LIBS AND (PCRE_FOUND OR PCRE_BUILD_SOURCE))
set(BUILD_CHIMERA TRUE)
endif()

Expand Down
4 changes: 2 additions & 2 deletions chimera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ SET(chimera_SRCS
)

add_library(chimera STATIC ${chimera_SRCS})
add_dependencies(chimera hs pcre)
target_link_libraries(chimera hs pcre)
message(STATUS "PCRE_LINK_LIBRARIES CHECK: ${PCRE_LINK_LIBRARIES}")
target_link_libraries(chimera hs ${PCRE_LINK_LIBRARIES})

install(TARGETS chimera DESTINATION ${CMAKE_INSTALL_LIBDIR})

Expand Down