Merge pull request #223 from SylvainCorlay/more-fixes-on-cmake-build-…

…type More fixes on cmake build type
jupyter-xeus · Jan 30, 2021 · ce21069 · ce21069
2 parents b16e4aa + 5d5bc73
commit ce21069
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -38,7 +38,7 @@ install:
   - conda install xeus=1.0.0 cppzmq xproperty=0.11.0 nlohmann_json -c conda-forge
   # Install build dependencies
   - conda install cmake -c conda-forge
-  - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DDOWNLOAD_GTEST=ON .
+  - cmake -G "NMake Makefiles" -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DDOWNLOAD_GTEST=ON .
   - nmake install
   - nmake test_xwidgets
   - cd test

diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml
@@ -19,7 +19,7 @@ steps:
       source activate xwidgets
       mkdir build
       cd build
-      cmake -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX $(Build.SourcesDirectory)
+      cmake -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDOWNLOAD_GTEST=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -D CMAKE_BUILD_TYPE=Release $(Build.SourcesDirectory)
     displayName: Configure xwidgets
     workingDirectory: $(Build.BinariesDirectory)
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -8,9 +8,6 @@
 
 cmake_minimum_required(VERSION 3.1)
 
-message(STATUS "Forcing tests build type to Release")
-set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
-
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     project(xwidgets-test)