diff --git a/CMakeLists.txt b/CMakeLists.txt index 3edc19ad8d20f260308c39e2b555f0aade883e89..f46e7bf0f24cdf3247c28f9b332b595b012543fa 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 cff939cc5a83a83cb0b2ce2c4cd83b063b44036a..78180ad91a2901f39c0a554999191990b5ff6a5e 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 77327dc868cb36c87fc7d84b48bcb9644d021cee..16271681acba5ceba20bc8ffdf6d6f129db1156a 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 35492e56a3c38beb4011a52bc31d8ddcbbdc4744..ccfda27658ba0db7baf5c2b974e5d7f00c0dbc0d 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 83b69ee75c3611a5b9d3186fce034c8dcf0b1b51..29f76e1c3d792995b558c8e59e83fbdbe355c879 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 710cdf0404ba356e38b3d85339a1267436cf601b..1ad9be78956ae602fc2362a1b49f48de4f7435d0 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 1b4b2ddb55607c17a583cbef97aac03bedef8acd..1d73689015f7e7f852627ad6639c72e95eb6e202 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 a402941c3ea08e00b62ad2f5ca7413a1e1ad385d..990c2b0a7308ee49beef064dc60a003e8189530f 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 24a4e4a0f2f93a90ca987d7166dbef3eefc24501..b9502617b476e6413e5d37cd8d8f6c749877df01 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 5ba8390b85408ea7d9a1186e11a36e7a0fcaf369..411533c13812243b3aa3a1c70fcae2cf6d656659 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 f85d709bcbb75dc0a79300116e55b6b4e28e8307..97a0e10f8418eae8d7f296dc1dce46a78d02c614 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 c8ecb2854bba3bbe1a325fed0bd04c41859336a0..3c29425f1e0b236f6f4a8a9827f9ed32dc71a8bd 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 6848f0fa616dfbcebbf39ab76d84168fd61adf33..6f2005ed371a4c9881c3106b890fa416a9d0c769 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 45497d4ecff200a111992d21b5f6958a5fbd9302..254e606c32904fd17fb3eac13e78c0ec9d31a71f 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 e1f71674f9b8f54a77cb73fdecc74befec8613d1..eb8a4d34b74f53c88d3ccbb0989f93f6f1afed78 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 539c2a6cd7c7c634e5daa0e79b8b5cde597cb015..9101d55e84ecf61656c203dd701fbcf5c0af8a60 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 6d373117a1676ae7a245001ac4ef53ffe1ce024e..2fd1b0e12341114f9c72ead0075e2313d64a0fd9 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)