From 8f96625ad5b10aab8b418722624faafd23d11b41 Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Thu, 21 Feb 2019 00:27:42 +0100
Subject: [PATCH] FIX: Added missing include dependency to boost_unit_test
library.
---
src/CMakeLists.txt | 113 +++++++++++++++++++++++----------------------
1 file changed, 57 insertions(+), 56 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5880a5b3..fc29c721 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,53 +14,53 @@ if ("${BUILD_LIB}" STREQUAL "yes")
endif ()
add_library(
- exprtk_wrap
+ exprtk_wrap
- ${LIB_TYPE}
+ ${LIB_TYPE}
- General/ExprtkWrapper.cpp
+ General/ExprtkWrapper.cpp
)
target_include_directories(
- exprtk_wrap
+ exprtk_wrap
- PRIVATE
- ${EXPRTK_INCLUDE_DIR}
- ${Boost_INCLUDE_DIRS}
- ${SRC_DIR}
+ PRIVATE
+ ${EXPRTK_INCLUDE_DIR}
+ ${Boost_INCLUDE_DIRS}
+ ${SRC_DIR}
)
target_link_libraries(
- exprtk_wrap
+ exprtk_wrap
- PRIVATE
- ${Boost_LIBRARIES}
+ PRIVATE
+ ${Boost_LIBRARIES}
)
add_library(
- lib4neuro
-
- ${LIB_TYPE}
-
- Neuron/Neuron.cpp
- Neuron/NeuronBinary.cpp
- Neuron/NeuronConstant.cpp
- Neuron/NeuronLinear.cpp
- Neuron/NeuronLogistic.cpp
- Network/NeuralNetwork.cpp
- Network/NeuralNetworkSum.cpp
- NetConnection/ConnectionFunctionGeneral.cpp
- NetConnection/ConnectionFunctionIdentity.cpp
- LearningMethods/LearningMethods.cpp
- LearningMethods/ParticleSwarm.cpp
- LearningMethods/GradientDescent.cpp
- LearningMethods/LevenbergMarquardt.cpp
- DataSet/DataSet.cpp
- ErrorFunction/ErrorFunctions.cpp
- Solvers/DESolver.cpp
- CSVReader/CSVReader.cpp
- CrossValidator/CrossValidator.cpp
- NormalizationStrategy/NormalizationStrategy.cpp
+ lib4neuro
+
+ ${LIB_TYPE}
+
+ Neuron/Neuron.cpp
+ Neuron/NeuronBinary.cpp
+ Neuron/NeuronConstant.cpp
+ Neuron/NeuronLinear.cpp
+ Neuron/NeuronLogistic.cpp
+ Network/NeuralNetwork.cpp
+ Network/NeuralNetworkSum.cpp
+ NetConnection/ConnectionFunctionGeneral.cpp
+ NetConnection/ConnectionFunctionIdentity.cpp
+ LearningMethods/LearningMethods.cpp
+ LearningMethods/ParticleSwarm.cpp
+ LearningMethods/GradientDescent.cpp
+ LearningMethods/LevenbergMarquardt.cpp
+ DataSet/DataSet.cpp
+ ErrorFunction/ErrorFunctions.cpp
+ Solvers/DESolver.cpp
+ CSVReader/CSVReader.cpp
+ CrossValidator/CrossValidator.cpp
+ NormalizationStrategy/NormalizationStrategy.cpp
)
# FileSystem C++ library - has to be linked manually in GCC-8
@@ -70,35 +70,35 @@ if ("${BUILD_LIB}" STREQUAL "yes")
endif ()
target_link_libraries(
- lib4neuro
+ lib4neuro
- PRIVATE
- exprtk_wrap
- ${Boost_LIBRARIES}
- ${CXX_FILESYSTEM_LIB}
- armadillo
+ PRIVATE
+ exprtk_wrap
+ ${Boost_LIBRARIES}
+ ${CXX_FILESYSTEM_LIB}
+ armadillo
)
target_include_directories(
- lib4neuro
+ lib4neuro
- PUBLIC
- ${ROOT_DIR}/include
+ PUBLIC
+ ${ROOT_DIR}/include
- PRIVATE
- ${EXPRTK_INCLUDE_DIR}
- ${SRC_DIR}
- ${Boost_INCLUDE_DIRS}
- ${ARMADILLO_INCLUDE_DIRS}
+ PRIVATE
+ ${EXPRTK_INCLUDE_DIR}
+ ${SRC_DIR}
+ ${Boost_INCLUDE_DIRS}
+ ${ARMADILLO_INCLUDE_DIRS}
)
set_target_properties(
- lib4neuro
+ lib4neuro
- PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
- LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
- RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin"
+ PROPERTIES
+ ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
+ LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
+ RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin"
)
set(PREFIX "")
@@ -114,10 +114,11 @@ if ("${BUILD_LIB}" STREQUAL "yes")
endif ()
target_include_directories(
- ${PREFIX}boost_unit_test
+ ${PREFIX}boost_unit_test
- PRIVATE
- ${Boost_INCLUDE_DIRS}
+ PRIVATE
+ ${Boost_INCLUDE_DIRS}
+ ${EXPRTK_INCLUDE_DIRECTORY}
)
endif ()
--
GitLab