From 5553a538c520aaf1d1adb9c42166a71f3ea62105 Mon Sep 17 00:00:00 2001 From: Kosta Date: Mon, 5 Aug 2013 12:57:29 +0200 Subject: [PATCH] tweak CMakeLists.txt --- projects/CMake/CMakeLists.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 9584c19b..c79059bf 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -3,16 +3,10 @@ cmake_minimum_required(VERSION 2.8) project(Catch C CXX) message("configure: Catch/SelfTest") -# switch to the right compiler -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -if(APPLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") -endif(APPLE) - # define some folders -set(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../") +set(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest) -set(SCRIPTS_DIR ${CATCH_DIR}/scripts/) +set(SCRIPTS_DIR ${CATCH_DIR}/scripts) # define the sources of the self test set( @@ -34,13 +28,9 @@ set( ) # configure the executable -include_directories(${CATCH_DIR}/include/) +include_directories(${CATCH_DIR}/include) add_executable(SelfTest ${SOURCES}) # configure unit tests via ctest enable_testing() add_test(NAME SelfTest_run COMMAND python ${SCRIPTS_DIR}/approvalTests.py "${CATCH_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/SelfTest") - -#add_custom_target(SelfTest_scripts ALL -# COMMAND ${CMAKE_COMMAND} -E create_symlink \"${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Resources/mentor2wkt.json\" \"${CMAKE_CURRENT_BINARY_DIR}/mentor2wkt.json\" -#)