CONFIG_PATH is now supplied by ac_mkbuilddir. While using would be a bit more idiomatic, ASTAROTH_CONF_PATH is probably safer since ac_mkbuilddir.sh does the copying and knows for sure what the correct path is.
This commit is contained in:
@@ -73,10 +73,7 @@ cd ${BUILD_DIR}
|
||||
echo "cp ${AC_HOME}/config/astaroth.conf ${PWD}"
|
||||
cp ${AC_HOME}/config/astaroth.conf .
|
||||
|
||||
CONF_DIR="-D ASTAROTH_CONF_PATH=${PWD}" # JP: Warning, not used in src/standalone/CMakeLists.txt.
|
||||
# The config path supplied by cmake and this define
|
||||
# is redundant.
|
||||
|
||||
CONF_DIR="-D ASTAROTH_CONF_PATH=${PWD}"
|
||||
|
||||
#cmake -D CMAKE_C_COMPILER=icc -D CMAKE_CXX_COMPILER=icpc -DDOUBLE_PRECISION=OFF -DBUILD_DEBUG=OFF ${AC_HOME}
|
||||
|
||||
|
@@ -32,7 +32,8 @@ target_link_libraries(ac_run PRIVATE astaroth_standalone astaroth_core "${OpenMP
|
||||
|
||||
# Define the config directory
|
||||
if (ALTER_CONF)
|
||||
target_compile_definitions(astaroth_standalone PRIVATE CONFIG_PATH="${CMAKE_BINARY_DIR}/")
|
||||
# ASTAROTH_CONF_PATH supplied by ac_mkbuilddir.sh
|
||||
target_compile_definitions(astaroth_standalone PRIVATE CONFIG_PATH="${ASTAROTH_CONF_PATH}/")
|
||||
else()
|
||||
target_compile_definitions(astaroth_standalone PRIVATE CONFIG_PATH="${CMAKE_SOURCE_DIR}/config/")
|
||||
endif()
|
||||
|
Reference in New Issue
Block a user