From 03b1b6a5c3658381c86dad332907270ae8f0b450 Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Wed, 30 Dec 2015 23:58:03 +0300 Subject: scripts: Fix default value for STATIC_CRT option Also refactor to use the same case and run after common options. --- scripts/CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index c90c78e..82f7adb 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,10 +1,15 @@ project(pugixml) cmake_minimum_required(VERSION 2.6) -IF (MSVC) - option(STATIC_CRT "Use static CRT libraries" ON) +option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) +option(BUILD_TESTS "Build tests" OFF) +set(BUILD_DEFINES "" CACHE STRING "Build defines") + +if(MSVC) + option(STATIC_CRT "Use static CRT libraries" OFF) + # Rewrite command line flags to use /MT if necessary if(STATIC_CRT) foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE @@ -14,11 +19,7 @@ IF (MSVC) endif(${flag_var} MATCHES "/MD") endforeach(flag_var) endif() -ENDIF() - -option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) -option(BUILD_TESTS "Build tests" OFF) -set(BUILD_DEFINES "" CACHE STRING "Build defines") +endif() # Pre-defines standard install locations on *nix systems. include(GNUInstallDirs) -- cgit v1.2.3