Improce CMake files

diff --git a/CMakeCommon/GTest.cmake b/CMakeCommon/GTest.cmake
index 448ba617de09b3052f04536b70e2fc029a11f580..13c245511bf1eb8d55027408970b9802a0a45e3e 100644 (file)
--- a/CMakeCommon/GTest.cmake
+++ b/CMakeCommon/GTest.cmake
@@ -16,9 +16,9 @@ include(FindGTest)
 add_definitions(-DGTEST_LANG_CXX11=0)
 
 include_directories(
-    $ENV{GTEST_ROOT}/googletest/include
-    $ENV{GTEST_ROOT}/googlemock/include
-    )
+  $ENV{GTEST_ROOT}/googletest/include
+  $ENV{GTEST_ROOT}/googlemock/include
+)
     
 set(GTEST_LIBRARY $ENV{GTEST_ROOT}/googlemock/make/gmock_main.a)
   
\ No newline at end of file

diff --git a/src/ConstructionAPI/CMakeLists.txt b/src/ConstructionAPI/CMakeLists.txt
index 81ada7e09743285ce7b4f355d6f090da4b509d38..ae9364b45912e376fdb9d4bbdc4da6e3f7a04431 100644 (file)
--- a/src/ConstructionAPI/CMakeLists.txt
+++ b/src/ConstructionAPI/CMakeLists.txt
@@ -17,6 +17,7 @@ SET(PROJECT_LIBRARIES
 )
 
 INCLUDE_DIRECTORIES(
+  ${PROJECT_SOURCE_DIR}/src/Events
   ${PROJECT_SOURCE_DIR}/src/ModelAPI
   ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
 )

diff --git a/src/ConstructionAPI/Test/CMakeLists.txt b/src/ConstructionAPI/Test/CMakeLists.txt
index 2df95c8c2c1bfbfd5750484585efcf84d45da1aa..b04b43d2661883456d5b0e48869f047c596a3bf7 100644 (file)
--- a/src/ConstructionAPI/Test/CMakeLists.txt
+++ b/src/ConstructionAPI/Test/CMakeLists.txt
@@ -2,18 +2,15 @@
 
 include(GTest)
 
+set(PROJECT_SOURCES
+  TestPoint.cpp
+)
+
 include_directories(
-  ${PROJECT_SOURCE_DIR}/src/Events
-  ${PROJECT_SOURCE_DIR}/src/ModelAPI
-  ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
   ${PROJECT_SOURCE_DIR}/src/ConstructionAPI
   ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/Mock
 )
 
-set(PROJECT_SOURCES
-  TestPoint.cpp
-)
-
 set(PROJECT_LIBRARIES
   ModelAPI
   ModelHighAPI