Skip to content
Snippets Groups Projects
Commit 8f96625a authored by Martin Beseda's avatar Martin Beseda
Browse files

FIX: Added missing include dependency to boost_unit_test library.

parent a2bf0550
No related branches found
No related tags found
No related merge requests found
...@@ -14,53 +14,53 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -14,53 +14,53 @@ if ("${BUILD_LIB}" STREQUAL "yes")
endif () endif ()
add_library( add_library(
exprtk_wrap exprtk_wrap
${LIB_TYPE} ${LIB_TYPE}
General/ExprtkWrapper.cpp General/ExprtkWrapper.cpp
) )
target_include_directories( target_include_directories(
exprtk_wrap exprtk_wrap
PRIVATE PRIVATE
${EXPRTK_INCLUDE_DIR} ${EXPRTK_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${SRC_DIR} ${SRC_DIR}
) )
target_link_libraries( target_link_libraries(
exprtk_wrap exprtk_wrap
PRIVATE PRIVATE
${Boost_LIBRARIES} ${Boost_LIBRARIES}
) )
add_library( add_library(
lib4neuro lib4neuro
${LIB_TYPE} ${LIB_TYPE}
Neuron/Neuron.cpp Neuron/Neuron.cpp
Neuron/NeuronBinary.cpp Neuron/NeuronBinary.cpp
Neuron/NeuronConstant.cpp Neuron/NeuronConstant.cpp
Neuron/NeuronLinear.cpp Neuron/NeuronLinear.cpp
Neuron/NeuronLogistic.cpp Neuron/NeuronLogistic.cpp
Network/NeuralNetwork.cpp Network/NeuralNetwork.cpp
Network/NeuralNetworkSum.cpp Network/NeuralNetworkSum.cpp
NetConnection/ConnectionFunctionGeneral.cpp NetConnection/ConnectionFunctionGeneral.cpp
NetConnection/ConnectionFunctionIdentity.cpp NetConnection/ConnectionFunctionIdentity.cpp
LearningMethods/LearningMethods.cpp LearningMethods/LearningMethods.cpp
LearningMethods/ParticleSwarm.cpp LearningMethods/ParticleSwarm.cpp
LearningMethods/GradientDescent.cpp LearningMethods/GradientDescent.cpp
LearningMethods/LevenbergMarquardt.cpp LearningMethods/LevenbergMarquardt.cpp
DataSet/DataSet.cpp DataSet/DataSet.cpp
ErrorFunction/ErrorFunctions.cpp ErrorFunction/ErrorFunctions.cpp
Solvers/DESolver.cpp Solvers/DESolver.cpp
CSVReader/CSVReader.cpp CSVReader/CSVReader.cpp
CrossValidator/CrossValidator.cpp CrossValidator/CrossValidator.cpp
NormalizationStrategy/NormalizationStrategy.cpp NormalizationStrategy/NormalizationStrategy.cpp
) )
# FileSystem C++ library - has to be linked manually in GCC-8 # FileSystem C++ library - has to be linked manually in GCC-8
...@@ -70,35 +70,35 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -70,35 +70,35 @@ if ("${BUILD_LIB}" STREQUAL "yes")
endif () endif ()
target_link_libraries( target_link_libraries(
lib4neuro lib4neuro
PRIVATE PRIVATE
exprtk_wrap exprtk_wrap
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${CXX_FILESYSTEM_LIB} ${CXX_FILESYSTEM_LIB}
armadillo armadillo
) )
target_include_directories( target_include_directories(
lib4neuro lib4neuro
PUBLIC PUBLIC
${ROOT_DIR}/include ${ROOT_DIR}/include
PRIVATE PRIVATE
${EXPRTK_INCLUDE_DIR} ${EXPRTK_INCLUDE_DIR}
${SRC_DIR} ${SRC_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${ARMADILLO_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS}
) )
set_target_properties( set_target_properties(
lib4neuro lib4neuro
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin"
) )
set(PREFIX "") set(PREFIX "")
...@@ -114,10 +114,11 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -114,10 +114,11 @@ if ("${BUILD_LIB}" STREQUAL "yes")
endif () endif ()
target_include_directories( target_include_directories(
${PREFIX}boost_unit_test ${PREFIX}boost_unit_test
PRIVATE PRIVATE
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${EXPRTK_INCLUDE_DIRECTORY}
) )
endif () endif ()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment