cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the definition of AC_DEFAULT_CONFIG to the root-level CMakeLists.txt. Now should be visible throughout the project.

Browse Source
This commit is contained in:
jpekkila
2019-12-03 18:42:49 +02:00
parent f97e5cb77c
commit 6e63411170
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -85,6 +85,8 @@ else ()
add_definitions(-DAC_DOUBLE_PRECISION=0) add_definitions(-DAC_DOUBLE_PRECISION=0)
endif () endif ()
add_definitions(-DAC_DEFAULT_CONFIG="${CMAKE_SOURCE_DIR}/config/astaroth.conf")
## Include directories ## Include directories
include_directories(.) include_directories(.)
include_directories(include) include_directories(include)

3
src/standalone/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ endif ()
## Compilation flags ## Compilation flags
add_compile_options(-pipe ${OpenMP_CXX_FLAGS}) add_compile_options(-pipe ${OpenMP_CXX_FLAGS})
add_compile_options(-Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion)# -Wshadow) add_compile_options(-Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion -Wshadow)
## Compile and link ## Compile and link
add_library(astaroth_standalone STATIC ${SOURCES}) add_library(astaroth_standalone STATIC ${SOURCES})
@@ -30,4 +30,3 @@ target_link_libraries(astaroth_standalone PRIVATE astaroth_core "${OpenMP_CXX_FL
add_executable(ac_run main.cc) add_executable(ac_run main.cc)
target_link_libraries(ac_run PRIVATE astaroth_standalone) target_link_libraries(ac_run PRIVATE astaroth_standalone)
add_definitions(-DAC_DEFAULT_CONFIG="${CMAKE_SOURCE_DIR}/config/astaroth.conf")

1
src/utils/CMakeLists.txt
View File

@@ -8,4 +8,3 @@ add_compile_options(-Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion
## Compile ## Compile
add_library(astaroth_utils STATIC config_loader.c memory.c verification.c) add_library(astaroth_utils STATIC config_loader.c memory.c verification.c)
target_link_libraries(astaroth_utils PRIVATE astaroth_core m) target_link_libraries(astaroth_utils PRIVATE astaroth_core m)
target_compile_definitions(astaroth_utils PUBLIC -DAC_DEFAULT_CONFIG="${CMAKE_SOURCE_DIR}/config/astaroth.conf")