cmake file refactored

CMakeLists.txt

@@ -3,6 +3,21 @@ project(NeuralNetwork CXX)
 
 include(cmake/CPUFeatures)
 
+add_subdirectory(lib/SimpleJSON)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Weffc++ -Wshadow -Wstrict-aliasing -ansi -Woverloaded-virtual -Wdelete-non-virtual-dtor -Wno-unused-function")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14")
+
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -march=native -mtune=native -O3")
+
+set(${PROJECT_NAME}_INCLUDE_DIRS
+		${PROJECT_SOURCE_DIR}/include
+		lib/EvolutionaryAlgorithm/include
+		${SimpleJSON_INCLUDE_DIRS}
+		CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
+
+include_directories(${NeuralNetwork_INCLUDE_DIRS} ${SimpleJSON_INCLUDE_DIRS})
+
 OPTION(BUILD_SHARED_LIBS "Build also shared library." ON)
 
 if(CPU_AVX_AVAILABLE)
@@ -28,11 +43,6 @@ OPTION(USE_FMA "If FMA instruction set should be used." OFF)
 
 OPTION(ENABLE_TESTS "enables tests" ON)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Weffc++ -Wshadow -Wstrict-aliasing -ansi -Woverloaded-virtual -Wdelete-non-virtual-dtor -Wno-unused-function")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14")
-
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -march=native -mtune=native -O3")
-
 if(USE_AVX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx -DUSE_AVX")
 	if(USE_FMA)
@@ -48,10 +58,6 @@ if(USE_SSE)
 	endif(USE_SSE2)
 endif(USE_SSE)
 
-include_directories(./include/)
-include_directories(./lib/SimpleJSON/include)
-include_directories(./lib/EvolutionaryAlgorithm/include)
-
 set (LIBRARY_SOURCES
 	src/sse_mathfun.cpp
 
@@ -139,3 +145,4 @@ IF(ENABLE_TESTS)
 	set_property(TEST genetic_programing PROPERTY LABELS unit)
 
 ENDIF(ENABLE_TESTS)
+