From 9d1d2aca0aeb265a11fb462a4cebb334bf24479c Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Sat, 18 Nov 2017 17:31:11 +0100 Subject: [PATCH] updated build system --- CMakeLists.txt | 12 ++++-------- test/CMakeLists.txt | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 805340f64..8c35afb15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,14 +55,10 @@ if(NOT MSVC) endif() # -# CMake configuration +# Include EnTT # -set(PROJECT_CMAKE_IN ${entt_SOURCE_DIR}/cmake/in) -set(PROJECT_DEPS_DIR ${entt_SOURCE_DIR}/deps) -set(PROJECT_SRC_DIR ${entt_SOURCE_DIR}/src) - -set(PROJECT_RUNTIME_OUTPUT_DIRECTORY bin) +include_directories(${entt_SOURCE_DIR}/src) # # Tests @@ -75,8 +71,8 @@ if(BUILD_TESTING) find_package(Threads REQUIRED) # gtest, gtest_main, gmock and gmock_main targets are available from now on - set(GOOGLETEST_DEPS_DIR ${PROJECT_DEPS_DIR}/googletest) - configure_file(${PROJECT_CMAKE_IN}/googletest.in ${GOOGLETEST_DEPS_DIR}/CMakeLists.txt) + set(GOOGLETEST_DEPS_DIR ${entt_SOURCE_DIR}/deps/googletest) + configure_file(${entt_SOURCE_DIR}/cmake/in/googletest.in ${GOOGLETEST_DEPS_DIR}/CMakeLists.txt) execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY ${GOOGLETEST_DEPS_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY ${GOOGLETEST_DEPS_DIR}) set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 909096f2d..9263395fd 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,8 +2,6 @@ # Tests configuration # -include_directories(${PROJECT_SRC_DIR}) - add_library(odr OBJECT odr.cpp) # Test benchmark