Browse Source

Update cmake

Michael Ragazzon 6 years ago
parent
commit
da6a3495d5
2 changed files with 7 additions and 2 deletions
  1. 4 1
      .appveyor.yml
  2. 3 1
      CMakeLists.txt

+ 4 - 1
.appveyor.yml

@@ -21,8 +21,11 @@ install:
     mv win64 lib
 
     cd ..
+    
+    mkdir Build
+    cd Build
 
-    cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_SAMPLES=%BUILD_SAMPLES% .
+    cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DBUILD_SAMPLES=%BUILD_SAMPLES% ..
 build:
   parallel: true
   verbosity: minimal

+ 3 - 1
CMakeLists.txt

@@ -33,7 +33,6 @@ endif(APPLE)
 
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0015 NEW)
-	cmake_policy(SET CMP0074 NEW)
 endif(COMMAND cmake_policy)
 
 # Enable the use of MACOSX_RPATH by default for CMake v3.0+; this effectively 
@@ -47,6 +46,9 @@ endif(COMMAND cmake_policy)
 if(POLICY CMP0042)
 	cmake_policy(SET CMP0042 NEW)
 endif(POLICY CMP0042)
+if(POLICY CMP0074)
+	cmake_policy(SET CMP0074 NEW)
+endif(POLICY CMP0074)
 
 project(RmlUi C CXX)