From f9051eec1abbbe17ab87810e82f22f35fdcf7f13 Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Mon, 9 Nov 2015 13:29:02 +0100
Subject: [PATCH] Moved cmake minimum version from 2.8.11 to 2.8.12; cleaned up
 some CMakeLists.txt files

---
 CMakeLists.txt                                  | 2 +-
 Doc/UserManual/CMakeLists.txt                   | 2 --
 Examples/cpp/CylindersAndPrisms/CMakeLists.txt  | 2 +-
 GUI/CMakeLists.txt                              | 3 +--
 GUI/coregui/CMakeLists.txt                      | 7 +++----
 GUI/crashhandler/CMakeLists.txt                 | 1 -
 GUI/externals/qcustomplot/CMakeLists.txt        | 1 -
 GUI/externals/qt-manhattan-style/CMakeLists.txt | 1 -
 GUI/externals/qtpropertybrowser/CMakeLists.txt  | 1 -
 GUI/main/CMakeLists.txt                         | 3 +--
 Tests/FunctionalTests/TestCore/CMakeLists.txt   | 4 +---
 Tests/FunctionalTests/TestFit/CMakeLists.txt    | 2 --
 Tests/FunctionalTests/TestPyCore/CMakeLists.txt | 2 --
 ThirdParty/gtest/gtest-1.7.0/CMakeLists.txt     | 1 -
 dev-tools/openmpi/batest/CMakeLists.txt         | 2 --
 dev-tools/openmpi/helloworld/CMakeLists.txt     | 2 --
 man/CMakeLists.txt                              | 4 +---
 17 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3edc19ad8d2..f46e7bf0f24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMakeLists.txt file for building BornAgain framework
 ############################################################################
 
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 project(BornAgain)
 
diff --git a/Doc/UserManual/CMakeLists.txt b/Doc/UserManual/CMakeLists.txt
index cff939cc5a8..78180ad91a2 100644
--- a/Doc/UserManual/CMakeLists.txt
+++ b/Doc/UserManual/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
-
 project(BornAgainManual NONE)
 
 # version is read from main directory,
diff --git a/Examples/cpp/CylindersAndPrisms/CMakeLists.txt b/Examples/cpp/CylindersAndPrisms/CMakeLists.txt
index 77327dc868c..16271681acb 100644
--- a/Examples/cpp/CylindersAndPrisms/CMakeLists.txt
+++ b/Examples/cpp/CylindersAndPrisms/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 project(CylindersAndPrisms)
 
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 35492e56a3c..ccfda27658b 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -1,14 +1,13 @@
 ############################################################################
 # CMakeLists.txt file for building BornAgain/GUI libraries and executable
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()
 if(POLICY CMP0043)
     cmake_policy(SET CMP0043 NEW)
 endif()
- 
+
 message(STATUS "Configuring BornAgain GUI")
 
 find_package(Qt5Widgets REQUIRED)
diff --git a/GUI/coregui/CMakeLists.txt b/GUI/coregui/CMakeLists.txt
index 83b69ee75c3..29f76e1c3d7 100644
--- a/GUI/coregui/CMakeLists.txt
+++ b/GUI/coregui/CMakeLists.txt
@@ -1,7 +1,6 @@
 ############################################################################
 # CMakeLists.txt file for building libBornAgainGUI library
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()
@@ -100,7 +99,7 @@ set(resource_files
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 qt5_add_resources(RC_SRCS ${resource_files})
- 
+
 # --- definitions ------
 if(BORNAGAIN_CRASHHADLER)
     add_definitions(-DBORNAGAIN_CRASHHANDLER)
@@ -176,7 +175,7 @@ if(WIN32)
     ${QTDIR}/bin/Qt5Designer.dll
     ${QTDIR}/bin/Qt5Xml.dll
     #${QTDIR}/bin/libGLESv2.dll
-    #${QTDIR}/bin/libEGL.dll    
+    #${QTDIR}/bin/libEGL.dll
     ${QTDIR}/bin/icuin54.dll
     ${QTDIR}/bin/icuuc54.dll
     ${QTDIR}/bin/icudt54.dll
@@ -190,7 +189,7 @@ if(WIN32)
     ${QTDIR}/bin/Qt5Sensors.dll
     ${QTDIR}/bin/Qt5Sql.dll
     #${QTDIR}/bin/Qt5V8.dll
-    ${QTDIR}/bin/Qt5WebKit.dll    
+    ${QTDIR}/bin/Qt5WebKit.dll
     DESTINATION ${destination_lib} COMPONENT Libraries)
 
     install(FILES
diff --git a/GUI/crashhandler/CMakeLists.txt b/GUI/crashhandler/CMakeLists.txt
index 710cdf0404b..1ad9be78956 100644
--- a/GUI/crashhandler/CMakeLists.txt
+++ b/GUI/crashhandler/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
 if(POLICY CMP0020)
 cmake_policy(SET CMP0020 NEW)
 endif()
diff --git a/GUI/externals/qcustomplot/CMakeLists.txt b/GUI/externals/qcustomplot/CMakeLists.txt
index 1b4b2ddb556..1d73689015f 100644
--- a/GUI/externals/qcustomplot/CMakeLists.txt
+++ b/GUI/externals/qcustomplot/CMakeLists.txt
@@ -1,7 +1,6 @@
 ############################################################################
 # CMakeLists.txt file for building qcustomplot static library
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11)
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()
diff --git a/GUI/externals/qt-manhattan-style/CMakeLists.txt b/GUI/externals/qt-manhattan-style/CMakeLists.txt
index a402941c3ea..990c2b0a730 100644
--- a/GUI/externals/qt-manhattan-style/CMakeLists.txt
+++ b/GUI/externals/qt-manhattan-style/CMakeLists.txt
@@ -1,7 +1,6 @@
 ############################################################################
 # CMakeLists.txt file for building libManhattanStyle
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11)
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()
diff --git a/GUI/externals/qtpropertybrowser/CMakeLists.txt b/GUI/externals/qtpropertybrowser/CMakeLists.txt
index 24a4e4a0f2f..b9502617b47 100644
--- a/GUI/externals/qtpropertybrowser/CMakeLists.txt
+++ b/GUI/externals/qtpropertybrowser/CMakeLists.txt
@@ -1,7 +1,6 @@
 ############################################################################
 # CMakeLists.txt file for building static qtpropertybrowser library from qtsolutions
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11)
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()
diff --git a/GUI/main/CMakeLists.txt b/GUI/main/CMakeLists.txt
index 5ba8390b854..411533c1381 100644
--- a/GUI/main/CMakeLists.txt
+++ b/GUI/main/CMakeLists.txt
@@ -1,7 +1,6 @@
 ############################################################################
 # CMakeLists.txt file for building BornAgain/GUI executable
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
 if(POLICY CMP0020)
 cmake_policy(SET CMP0020 NEW)
 endif()
@@ -42,7 +41,7 @@ if(WIN32)
 elseif(APPLE AND BORNAGAIN_APPLE_BUNDLE)
     set(executable_options MACOSX_BUNDLE)
 endif()
- 
+
 
 # --- system dependent files ---------
 if(WIN32)
diff --git a/Tests/FunctionalTests/TestCore/CMakeLists.txt b/Tests/FunctionalTests/TestCore/CMakeLists.txt
index f85d709bcbb..97a0e10f841 100644
--- a/Tests/FunctionalTests/TestCore/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestCore/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CMakeLists.txt file for building TestCore functional tests
 ############################################################################
 
-set(CMAKE_CXX_FLAGS "-DSTANDALONE")
-
 include_directories(
     ${Boost_INCLUDE_DIRS}
     ${BornAgainCore_INCLUDE_DIRS}
@@ -11,7 +9,7 @@ include_directories(
     ${GSL_INCLUDE_DIR}
 )
 
-# for some reason these flags doesn't propagated here by SetUpWindows.cmake
+# for some reason these flags aren't propagated here by SetUpWindows.cmake
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc ")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /EHsc ")
diff --git a/Tests/FunctionalTests/TestFit/CMakeLists.txt b/Tests/FunctionalTests/TestFit/CMakeLists.txt
index c8ecb2854bb..3c29425f1e0 100644
--- a/Tests/FunctionalTests/TestFit/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestFit/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CMakeLists.txt file for building TestFit functional tests
 ############################################################################
 
-set(CMAKE_CXX_FLAGS "-DSTANDALONE")
-
 set(list_of_tests
     "FitSuite/Minuit2_Migrad"
     "FitSuite/Minuit2_Fumili"
diff --git a/Tests/FunctionalTests/TestPyCore/CMakeLists.txt b/Tests/FunctionalTests/TestPyCore/CMakeLists.txt
index 6848f0fa616..6f2005ed371 100644
--- a/Tests/FunctionalTests/TestPyCore/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestPyCore/CMakeLists.txt
@@ -2,8 +2,6 @@
 # CMakeLists.txt file for running TestPyCore functional tests
 ############################################################################
 
-set(CMAKE_CXX_FLAGS "-DSTANDALONE")
-
 # for some reason these flags doesn't propagated here by SetUpWindows.cmake
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc ")
diff --git a/ThirdParty/gtest/gtest-1.7.0/CMakeLists.txt b/ThirdParty/gtest/gtest-1.7.0/CMakeLists.txt
index 45497d4ecff..254e606c329 100644
--- a/ThirdParty/gtest/gtest-1.7.0/CMakeLists.txt
+++ b/ThirdParty/gtest/gtest-1.7.0/CMakeLists.txt
@@ -40,7 +40,6 @@ endif()
 # ${gtest_BINARY_DIR}.
 # Language "C" is required for find_package(Threads).
 project(gtest CXX C)
-cmake_minimum_required(VERSION 2.8.11)
 if(POLICY CMP0042)
 cmake_policy(SET CMP0042 NEW)
 endif()
diff --git a/dev-tools/openmpi/batest/CMakeLists.txt b/dev-tools/openmpi/batest/CMakeLists.txt
index e1f71674f9b..eb8a4d34b74 100644
--- a/dev-tools/openmpi/batest/CMakeLists.txt
+++ b/dev-tools/openmpi/batest/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8.11)
-
 project(batest)
 
 add_executable(batest batest.cpp)
diff --git a/dev-tools/openmpi/helloworld/CMakeLists.txt b/dev-tools/openmpi/helloworld/CMakeLists.txt
index 539c2a6cd7c..9101d55e84e 100644
--- a/dev-tools/openmpi/helloworld/CMakeLists.txt
+++ b/dev-tools/openmpi/helloworld/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8.11)
-
 # CC=mpicc CXX=mpicxx cmake ../
 
 
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 6d373117a16..2fd1b0e1234 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
-
 add_custom_target(
     man ALL
     DEPENDS bornagain.1
@@ -11,4 +9,4 @@ add_custom_command(
     DEPENDS bornagain.pod
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bornagain.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
\ No newline at end of file
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bornagain.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
-- 
GitLab