]> granicus.if.org Git - icinga2/commitdiff
Build fix for Windows
authorGunnar Beutner <gunnar@beutner.name>
Mon, 11 Jan 2016 13:28:58 +0000 (14:28 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Tue, 23 Feb 2016 08:18:07 +0000 (09:18 +0100)
fixes #10824

CMakeLists.txt

index ca030adf1648747f3e2fcb7f29e2e05e0bcb7706..04a5b771915573a73962fc70ffcedaf847916a9d 100644 (file)
@@ -229,15 +229,17 @@ if(UNIX)
   endif()
 endif()
 
-set(CXX_FEATURE_OVERRIDE OFF)
+if(NOT MSVC)
+  set(CXX_FEATURE_OVERRIDE OFF)
 
-if(_ICINGA2_CXX11)
-  include(CheckCXXSourceCompiles)
-  check_cxx_source_compiles("class Base { public: virtual void test(void) { } }; class Derived : public Base { virtual void test(void) override { } }; int main(){}" CXX_FEATURE_OVERRIDE)
-endif()
+  if(_ICINGA2_CXX11)
+    include(CheckCXXSourceCompiles)
+    check_cxx_source_compiles("class Base { public: virtual void test(void) { } }; class Derived : public Base { virtual void test(void) override { } }; int main(){}" CXX_FEATURE_OVERRIDE)
+  endif()
 
-if(NOT CXX_FEATURE_OVERRIDE)
-  add_definitions("-Doverride=")
+  if(NOT CXX_FEATURE_OVERRIDE)
+    add_definitions("-Doverride=")
+  endif()
 endif()
 
 configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ESCAPE_QUOTES)