From ae2fc8d9158c9e8ec3c4335f989b0cf5934d22b7 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Mon, 12 Nov 2012 12:55:29 +0100 Subject: [PATCH] quickcheck fixes. --- CMakeLists.txt | 2 ++ Tests/CMakeLists.txt | 1 - ThirdParty/CMakeLists.txt | 2 +- scripts/cmake/SubmoduleSetup.cmake | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c043adc581d..31767af1e6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,8 @@ ENDIF() #OGS_PACKAGING # Add subdirectories with the projects ADD_SUBDIRECTORY( ThirdParty ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/ThirdParty ) +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/ThirdParty/quickcheck ) + ADD_SUBDIRECTORY( BaseLib ) ADD_SUBDIRECTORY( FemLib ) ADD_SUBDIRECTORY( FileIO ) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index de21e00f2b1..69f73c75dec 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -10,7 +10,6 @@ APPEND_SOURCE_FILES(TEST_SOURCES GeoLib) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/Tests/gtest - ${CMAKE_SOURCE_DIR}/Tests/quickcheck ${CMAKE_SOURCE_DIR}/BaseLib ${CMAKE_SOURCE_DIR}/GeoLib ) diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt index d12eec6d407..25d27330e51 100644 --- a/ThirdParty/CMakeLists.txt +++ b/ThirdParty/CMakeLists.txt @@ -8,4 +8,4 @@ SET_PROPERTY(TARGET test-logog PROPERTY FOLDER "logog") ADD_SUBDIRECTORY(zlib) -ADD_SUBDIRECTORY(gtest) \ No newline at end of file +ADD_SUBDIRECTORY(gtest) diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake index 9c99899b951..06d8946c0f0 100644 --- a/scripts/cmake/SubmoduleSetup.cmake +++ b/scripts/cmake/SubmoduleSetup.cmake @@ -1,7 +1,7 @@ # This file initializes the required submodules SET(REQUIRED_SUBMODULES - Tests/quickcheck + ThirdParty/quickcheck ) FOREACH(SUBMODULE ${REQUIRED_SUBMODULES}) -- GitLab