diff --git a/scripts/ac_mkbuilddir.sh b/scripts/ac_mkbuilddir.sh index c52bb8c..888f811 100755 --- a/scripts/ac_mkbuilddir.sh +++ b/scripts/ac_mkbuilddir.sh @@ -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} diff --git a/src/standalone/CMakeLists.txt b/src/standalone/CMakeLists.txt index b444800..6a03e32 100644 --- a/src/standalone/CMakeLists.txt +++ b/src/standalone/CMakeLists.txt @@ -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()