From b28cf20182585a91810d86c7ab7a7b5d28018799 Mon Sep 17 00:00:00 2001 From: Guillaume Papin Date: Wed, 8 Nov 2017 09:05:13 +0100 Subject: [PATCH] Revert "CMake: add CMake "workspace" project to build cctz and its dependencies" This reverts commit 793f6327f5489bea8931d4fb41f2e3e4a7b46fc4. --- cmake-workspace/CMakeLists.txt | 43 --------------------------- cmake-workspace/README.md | 16 ---------- cmake-workspace/cxx11-toolchain.cmake | 7 ----- 3 files changed, 66 deletions(-) delete mode 100644 cmake-workspace/CMakeLists.txt delete mode 100644 cmake-workspace/README.md delete mode 100644 cmake-workspace/cxx11-toolchain.cmake diff --git a/cmake-workspace/CMakeLists.txt b/cmake-workspace/CMakeLists.txt deleted file mode 100644 index e4d5f787..00000000 --- a/cmake-workspace/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12) - -include(ExternalProject) - -set_property(DIRECTORY PROPERTY EP_BASE .) - -if (NOT CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/cxx11-toolchain.cmake") -endif() - -ExternalProject_Add(ep_benchmark - URL https://github.com/google/benchmark/archive/master.zip - CMAKE_ARGS - -DBENCHMARK_ENABLE_TESTING=OFF - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_INSTALL_PREFIX=) -ExternalProject_Get_Property(ep_benchmark install_dir) -set(ep_benchmark_install_dir "${install_dir}") - -ExternalProject_Add(ep_gmock - URL https://github.com/google/googletest/archive/master.zip - CMAKE_ARGS - -DBUILD_GMOCK=ON - -Dgmock_build_tests=OFF - -Dgtest_build_samples=OFF - -Dgtest_build_tests=OFF - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DCMAKE_INSTALL_PREFIX=) -ExternalProject_Get_Property(ep_gmock install_dir) -set(ep_gmock_install_dir "${install_dir}") - -ExternalProject_Add(ep_cctz - SOURCE_DIR "${PROJECT_SOURCE_DIR}/.." - LIST_SEPARATOR :: - CMAKE_ARGS - -DBUILD_EXAMPLES=ON - -DBUILD_TESTING=ON - "-DCMAKE_PREFIX_PATH=${ep_benchmark_install_dir}::${ep_gmock_install_dir}" - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - INSTALL_COMMAND "" - TEST_COMMAND "${CMAKE_CTEST_COMMAND}" --output-on-failure - BUILD_ALWAYS 1 - DEPENDS ep_benchmark ep_gmock) diff --git a/cmake-workspace/README.md b/cmake-workspace/README.md deleted file mode 100644 index 8523008c..00000000 --- a/cmake-workspace/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# CMake workspace for CCTZ - -This CMake project offers a complete build of `cctz` and its dependencies. -- it uses CMake `ExternalProject` feature -- it runs the cctz tests -- it tries to keep a consistent compile options between the projects, - thanks to the toolchain file - -# How to use - -``` -mkdir build -cd build -cmake .. -make -``` diff --git a/cmake-workspace/cxx11-toolchain.cmake b/cmake-workspace/cxx11-toolchain.cmake deleted file mode 100644 index 3532649e..00000000 --- a/cmake-workspace/cxx11-toolchain.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) - -if (UNIX) - set(CMAKE_CXX_FLAGS "-std=c++${CMAKE_CXX_STANDARD}" CACHE STRING "" FORCE) -endif()