From 1eaa2227e9600920f5cf3c94faa0c32af13e1e84 Mon Sep 17 00:00:00 2001 From: Rui Abreu Ferreira Date: Sun, 20 Dec 2015 03:58:47 +0000 Subject: [PATCH] CMake: Defer setting CACHE CMAKE_BUILD_TYPE. The Visual Studio CMake generator fails to configure if CACHE CMAKE_BUILD_TYPE is set before CMAKE_BUILD_TYPE. --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84e824bd6a..6c3f4d927d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,17 +40,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(USE_FNAME_CASE TRUE) endif() -# Set available build types for CMake GUIs. -# A different build type can still be set by -DCMAKE_BUILD_TYPE=... -set_property(CACHE CMAKE_BUILD_TYPE PROPERTY - STRINGS "Debug" "Dev" "Release" "MinSizeRel" "RelWithDebInfo") - # Set default build type. if(NOT CMAKE_BUILD_TYPE) message(STATUS "CMAKE_BUILD_TYPE not given, defaulting to 'Dev'.") set(CMAKE_BUILD_TYPE "Dev" CACHE STRING "Choose the type of build." FORCE) endif() +# Set available build types for CMake GUIs. +# A different build type can still be set by -DCMAKE_BUILD_TYPE=... +set_property(CACHE CMAKE_BUILD_TYPE PROPERTY + STRINGS "Debug" "Dev" "Release" "MinSizeRel" "RelWithDebInfo") + # If not in a git repo (e.g., a tarball) these tokens define the complete # version string, else it is combined with the result of `git describe`. set(NVIM_VERSION_MAJOR 0)