Moved cmake minimum version from 2.8.11 to 2.8.12; cleaned up some CMakeLists.txt files

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)
 

Doc/UserManual/CMakeLists.txt

-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
-
 project(BornAgainManual NONE)
 
 # version is read from main directory,

Examples/cpp/CylindersAndPrisms/CMakeLists.txt

-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 project(CylindersAndPrisms)
 

GUI/CMakeLists.txt

 ############################################################################
 # 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)

GUI/coregui/CMakeLists.txt

 ############################################################################
 # 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

GUI/crashhandler/CMakeLists.txt

-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
 if(POLICY CMP0020)
 cmake_policy(SET CMP0020 NEW)
 endif()

GUI/externals/qcustomplot/CMakeLists.txt

 ############################################################################
 # CMakeLists.txt file for building qcustomplot static library
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11)
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()

GUI/externals/qt-manhattan-style/CMakeLists.txt

 ############################################################################
 # CMakeLists.txt file for building libManhattanStyle
 ############################################################################
-cmake_minimum_required(VERSION 2.8.11)
 if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()

GUI/externals/qtpropertybrowser/CMakeLists.txt

 ############################################################################
 # 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()

GUI/main/CMakeLists.txt

 ############################################################################
 # 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)

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 ")

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"

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 ")

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()

dev-tools/openmpi/batest/CMakeLists.txt

-cmake_minimum_required(VERSION 2.8.11)
-
 project(batest)
 
 add_executable(batest batest.cpp)

dev-tools/openmpi/helloworld/CMakeLists.txt

-cmake_minimum_required(VERSION 2.8.11)
-
 # CC=mpicc CXX=mpicxx cmake ../
 
 

man/CMakeLists.txt

-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)