From 01983f1d2671b61cf8aeb9907ef290e1699c3691 Mon Sep 17 00:00:00 2001 From: spo Date: Thu, 26 May 2016 16:55:03 +0300 Subject: [PATCH] Improce CMake files --- CMakeCommon/GTest.cmake | 6 +++--- src/ConstructionAPI/CMakeLists.txt | 1 + src/ConstructionAPI/Test/CMakeLists.txt | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeCommon/GTest.cmake b/CMakeCommon/GTest.cmake index 448ba617d..13c245511 100644 --- 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 81ada7e09..ae9364b45 100644 --- 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 2df95c8c2..b04b43d26 100644 --- 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 -- 2.39.2