From 1bd6e78c041627e51cba3420eade552721da8816 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 26 Oct 2016 14:28:41 +0300 Subject: CMakeLists.txt update --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21b9071..7f0db31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,20 +10,20 @@ project(privilege_check CXX) if(MSVC) add_compile_options(/MP /W4) -elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +elseif(CMAKE_COMPILER_IS_GNUCXX) add_compile_options(-Wall -Wextra) endif() -get_directory_property(PRIVILEGE_CHECK_PARENT_DIRECTORY PARENT_DIRECTORY) -set(PRIVILEGE_CHECK_IS_ROOT $) +get_directory_property(parent_directory PARENT_DIRECTORY) +set(is_root $) -function(privilege_check_use_static_runtime target) - if(TARGET ${target} AND PRIVILEGE_CHECK_IS_ROOT) +function(use_static_runtime target) + if(TARGET ${target} AND is_root) if(MSVC) target_compile_options(${target} PRIVATE $<$:/MT> $<$:/MTd>) - elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + elseif(CMAKE_COMPILER_IS_GNUCXX) get_target_property(type ${target} TYPE) if(type STREQUAL EXECUTABLE) target_link_libraries(${target} PRIVATE @@ -37,8 +37,8 @@ endfunction() macro(add_executable target) _add_executable(${ARGV}) if(TARGET ${target}) - privilege_check_use_static_runtime(${target}) - if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + use_static_runtime(${target}) + if(CMAKE_COMPILER_IS_GNUCXX) target_link_libraries(${target} PRIVATE $<$:-s>) endif() endif() @@ -52,7 +52,7 @@ add_executable(${PROJECT_NAME} WIN32 ${${PROJECT_NAME}_header_files} ${${PROJECT_NAME}_resource_files}) -if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +if(CMAKE_COMPILER_IS_GNUCXX) target_compile_options(${PROJECT_NAME} PRIVATE -std=c++11) endif() -- cgit v1.2.3