Resolved conflict

GothenburgBitFactory · Apr 27, 2019 · da45ef4 · da45ef4
1 parent 73a10c8
commit da45ef4
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,5 +1,14 @@
 cmake_minimum_required (VERSION 2.8)
 
+# This is a work-around for the following CMake issue:
+# https://gitlab.kitware.com/cmake/cmake/issues/16062
+# The issue has been fixed in CMake 3.11.0; the policy is set
+# to OLD for compatibility with older versions of CMake only.
+if(POLICY CMP0037 AND ${CMAKE_VERSION} VERSION_LESS "3.11.0")
+  cmake_policy(SET CMP0037 OLD)
+endif()
+
+>>>>>>> Do not set CMP0037 on CMake 3.11.0 and above
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/test