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

remove confusing OPTIMISE flag

Browse Source
This commit is contained in:
Konstantinos Margaritis 2021-09-02 15:34:55 +03:00 committed by Konstantinos Margaritis
parent 4027319d6c
commit be1551aa94
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -33,10 +33,8 @@ endif()
if(CMAKE_BUILD_TYPE MATCHES NONE|RELEASE|RELWITHDEBINFO|MINSIZEREL) if(CMAKE_BUILD_TYPE MATCHES NONE|RELEASE|RELWITHDEBINFO|MINSIZEREL)
message(STATUS "using release build") message(STATUS "using release build")
set(RELEASE_BUILD TRUE) set(RELEASE_BUILD TRUE)
set(OPTIMISE TRUE)
else() else()
set(RELEASE_BUILD FALSE) set(RELEASE_BUILD FALSE)
set(OPTIMISE FALSE)
endif() endif()
set(BINDIR "${PROJECT_BINARY_DIR}/bin") set(BINDIR "${PROJECT_BINARY_DIR}/bin")
@ -99,13 +97,11 @@ if(${RAGEL} STREQUAL "RAGEL-NOTFOUND")
message(FATAL_ERROR "Ragel state machine compiler not found") message(FATAL_ERROR "Ragel state machine compiler not found")
endif() endif()
option(OPTIMISE "Turns off compiler optimizations (on by default unless debug output enabled or coverage testing)" FALSE)
option(DEBUG_OUTPUT "Enable debug output (warning: very verbose)" FALSE) option(DEBUG_OUTPUT "Enable debug output (warning: very verbose)" FALSE)
if(DEBUG_OUTPUT) if(DEBUG_OUTPUT)
add_definitions(-DDEBUG) add_definitions(-DDEBUG)
set(OPTIMISE FALSE) set(RELEASE_BUILD FALSE)
endif(DEBUG_OUTPUT) endif(DEBUG_OUTPUT)
option(BUILD_SHARED_LIBS "Build shared libs instead of static" OFF) option(BUILD_SHARED_LIBS "Build shared libs instead of static" OFF)
@ -124,7 +120,7 @@ if (NOT BUILD_SHARED_LIBS)
endif () endif ()
#for config #for config
if (OPTIMISE) if (RELEASE_BUILD)
set(HS_OPTIMIZE ON) set(HS_OPTIMIZE ON)
endif() endif()
@ -202,7 +198,7 @@ endif ()
endif() endif()
endif() endif()
if(OPTIMISE) if(RELEASE_BUILD)
if (NOT CMAKE_BUILD_TYPE MATCHES MINSIZEREL) if (NOT CMAKE_BUILD_TYPE MATCHES MINSIZEREL)
set(OPT_C_FLAG "-O3") set(OPT_C_FLAG "-O3")
set(OPT_CXX_FLAG "-O3") set(OPT_CXX_FLAG "-O3")
@ -213,7 +209,7 @@ endif ()
else() else()
set(OPT_C_FLAG "-O0") set(OPT_C_FLAG "-O0")
set(OPT_CXX_FLAG "-O0") set(OPT_CXX_FLAG "-O0")
endif(OPTIMISE) endif(RELEASE_BUILD)
# set compiler flags - more are tested and added later # set compiler flags - more are tested and added later
set(EXTRA_C_FLAGS "${OPT_C_FLAG} -std=c17 -Wall -Wextra -Wshadow -Wcast-qual -fno-strict-aliasing") set(EXTRA_C_FLAGS "${OPT_C_FLAG} -std=c17 -Wall -Wextra -Wshadow -Wcast-qual -fno-strict-aliasing")
@ -685,7 +681,7 @@ set (hs_exec_SRCS
src/database.h src/database.h
) )
if (NOT OPTIMISE) if (NOT RELEASE_BUILD)
if (ARCH_IA32 OR ARCH_X86_64) if (ARCH_IA32 OR ARCH_X86_64)
set (hs_exec_SRCS set (hs_exec_SRCS
${hs_exec_SRCS} ${hs_exec_SRCS}