github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #221 from VectorCamp/bugfix/bug202-unit-internal

Browse Source 
Do not assume unit-internal is built for unit target
This commit is contained in:
Konstantinos Margaritis 2024-01-11 16:26:01 +02:00 committed by GitHub
commit e2439685a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unit/CMakeLists.txt
View File

@ -59,6 +59,7 @@ add_executable(unit-hyperscan ${unit_hyperscan_SOURCES})
target_link_libraries(unit-hyperscan hs expressionutil) target_link_libraries(unit-hyperscan hs expressionutil)
if (NOT FAT_RUNTIME AND BUILD_STATIC_LIBS) if (NOT FAT_RUNTIME AND BUILD_STATIC_LIBS)
set(BUILD_UNIT_INTERNAL TRUE)
set(unit_internal_SOURCES set(unit_internal_SOURCES
${gtest_SOURCES} ${gtest_SOURCES}
internal/bitfield.cpp internal/bitfield.cpp
@ -128,6 +129,8 @@ endif(NOT RELEASE_BUILD)
add_executable(unit-internal ${unit_internal_SOURCES}) add_executable(unit-internal ${unit_internal_SOURCES})
set_target_properties(unit-internal PROPERTIES COMPILE_FLAGS "${HS_CXX_FLAGS}") set_target_properties(unit-internal PROPERTIES COMPILE_FLAGS "${HS_CXX_FLAGS}")
target_link_libraries(unit-internal hs corpusomatic) target_link_libraries(unit-internal hs corpusomatic)
else()
set(BUILD_UNIT_INTERNAL FALSE)
endif (NOT FAT_RUNTIME AND BUILD_STATIC_LIBS) endif (NOT FAT_RUNTIME AND BUILD_STATIC_LIBS)
if (BUILD_CHIMERA) if (BUILD_CHIMERA)
@ -146,7 +149,7 @@ if (BUILD_CHIMERA)
# #
# build target to run unit tests # build target to run unit tests
# #
if (NOT RELEASE_BUILD) if (BUILD_UNIT_INTERNAL)
add_custom_target( add_custom_target(
unit unit
COMMAND bin/unit-internal COMMAND bin/unit-internal
@ -168,7 +171,7 @@ else()
# #
# build target to run unit tests # build target to run unit tests
# #
if (NOT RELEASE_BUILD) if (BUILD_UNIT_INTERNAL)
add_custom_target( add_custom_target(
unit unit
COMMAND bin/unit-internal COMMAND bin/unit-internal
@ -179,10 +182,9 @@ else()
else () else ()
add_custom_target( add_custom_target(
unit unit
COMMAND bin/unit-internal
COMMAND bin/unit-hyperscan COMMAND bin/unit-hyperscan
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
DEPENDS unit-internal unit-hyperscan DEPENDS unit-hyperscan
) )
endif() endif()
endif() endif()