فهرست منبع

Require CMake 3.3 as minimum and solve #1020

bel2125 3 سال پیش
والد
کامیت
a6dfd7c4b8
2فایلهای تغییر یافته به همراه5 افزوده شده و 10 حذف شده
  1. 4 9
      CMakeLists.txt
  2. 1 1
      cmake/FindWinSock.cmake

+ 4 - 9
CMakeLists.txt

@@ -1,12 +1,7 @@
-# Determines what CMake APIs we can rely on
-cmake_minimum_required (VERSION 2.8.12)
-if (${CMAKE_VERSION} VERSION_GREATER 3.2.2)
-  cmake_policy(VERSION 3.2.2)
-endif()
-if (${CMAKE_VERSION} VERSION_GREATER 3.1 OR
-    ${CMAKE_VERSION} VERSION_EQUAL 3.1)
-  cmake_policy(SET CMP0054 NEW)
-endif()
+# Use at least CMake 3.3
+cmake_minimum_required (VERSION 3.3.0)
+cmake_policy(VERSION 3.2.2)
+cmake_policy(SET CMP0054 NEW)
 
 # Set up the project
 project (civetweb)

+ 1 - 1
cmake/FindWinSock.cmake

@@ -74,7 +74,7 @@ if(MINGW)
     list(APPEND WINSOCK_LIBRARY_PATHS "${CMAKE_MATCH_1}")
   endif()
 endif()
-if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "AMD64" AND "${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
+if ("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "AMD64" AND "${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
   list(APPEND WINSOCK_LIBRARY_PATHS "C:/Windows/SysWOW64")
 endif()
 list(APPEND WINSOCK_LIBRARY_PATHS "C:/Windows/System32")