From 54ddc2ba11019925696bf4c9083326e61590b6f2 Mon Sep 17 00:00:00 2001 From: Mario Emmenlauer Date: Wed, 22 Jan 2020 13:13:48 +0100 Subject: [PATCH 1/2] test/CMakeLists.txt: Avoid repeated detection of xtensor --- test/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 78dae34..c84a626 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -110,7 +110,6 @@ include_directories(${GTEST_INCLUDE_DIRS} SYSTEM) include_directories(${XTENSOR_INCLUDE_DIR}) include_directories(${XBLAS_INCLUDE_DIR}) -find_package(xtensor REQUIRED) if(USE_OPENBLAS) find_package(OpenBLAS REQUIRED) set(BLAS_LIBRARIES ${CMAKE_INSTALL_PREFIX}${OpenBLAS_LIBRARIES}) From 13895e0400c86eebc786b28711b941a66e7370fe Mon Sep 17 00:00:00 2001 From: Mario Emmenlauer Date: Wed, 26 Jun 2019 23:28:05 +0200 Subject: [PATCH 2/2] Several minor cmake fixes --- CMakeLists.txt | 6 +++--- benchmark/CMakeLists.txt | 2 +- test/CMakeLists.txt | 10 +++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d061a1f..2b523a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,10 +88,10 @@ if (CXXBLAS_DEBUG) endif() OPTION(BUILD_TESTS "xtensor-blas test suite" OFF) -OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF) +OPTION(BUILD_BENCHMARK "xtensor-blas test suite" OFF) -OPTION(BUILD_BENCHMARKS "xtensor-blas test suite" OFF) -OPTION(DOWNLOAD_GBENCHMARK "build gtest from downloaded sources" OFF) +OPTION(DOWNLOAD_GTEST "download gtest and build from source" OFF) +OPTION(DOWNLOAD_GBENCHMARK "download google benchmark and build from source" OFF) if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) set(BUILD_TESTS ON) diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index 55cd476..5fbfc21 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -12,7 +12,7 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) project(xtensor-benchmark) find_package(xtensor REQUIRED CONFIG) - set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIR}) + set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS}) endif () message(STATUS "Forcing tests build type to Release") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c84a626..bb99cc6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,13 +13,17 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) project(xtensor-blas-test) find_package(xtensor REQUIRED CONFIG) - set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIR}) + set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS}) find_package(xtensor-blas REQUIRED CONFIG) set(XTENSOR_BLAS_INCLUDE_DIR ${xblas_INCLUDE_DIRS}) endif () -message(STATUS "Forcing tests build type to Release") -set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE) +if(NOT CMAKE_BUILD_TYPE) + message(STATUS "Setting tests build type to Release") + set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE) +else() + message(STATUS "Tests build type is ${CMAKE_BUILD_TYPE}") +endif() include(CheckCXXCompilerFlag)