Update cmake

geogubd · Jun 14, 2020 · c96b553 · c96b553
1 parent e925628
commit c96b553
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,15 +6,17 @@ if (POLICY CMP0074)
     message(STATUS "Set CMP0074 state to NEW")
     cmake_policy(SET CMP0074 NEW)
 endif()
-if (POLICY CMP0078)
-    message(STATUS "Set CMP0078 state to NEW")
-    cmake_policy(SET CMP0078 NEW)
-endif()
+
 if (POLICY CMP0086)
     message(STATUS "Set CMP0086 state to NEW")
     cmake_policy(SET CMP0086 NEW)
 endif()
 
+if (POLICY CMP0078)
+    message(STATUS "Set CMP0078 state to NEW")
+    cmake_policy(SET CMP0078 NEW)
+endif()
+
 # Prevent in source build
 set(CMAKE_DISABLE_SOURCE_CHANGES  ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -44,7 +44,7 @@ set_property(TARGET pyfmmlib PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(pyfmmlib ${GDAL_LIBRARIES} ${Boost_LIBRARIES}
 ${OSMIUM_LIBRARIES})
 # Add the target.
-if (${CMAKE_VERSION} VERSION_LESS 3.8.0)
+if (${CMAKE_VERSION} VERSION_LESS 3.13.0)
   message(STATUS "Using swig add module")
   set_property(SOURCE ${PROJECT_SOURCE_DIR}/python/fmm.i
     PROPERTY SWIG_MODULE_NAME fmm)