diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt index 7fb931713a..b58729d0b7 100644 --- a/ApplicationExeCode/CMakeLists.txt +++ b/ApplicationExeCode/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(ApplicationExeCode) # set packaging dir @@ -597,7 +595,6 @@ if(RESINSIGHT_PRIVATE_INSTALL) TARGET "Boost::filesystem" PROPERTY LOCATION_RELEASE ) - message("_filepath: ${_filepath}") # The location of Boost is based on the file structure as installed by vcpkg # The DLLs are located in the /bin folder @@ -607,8 +604,6 @@ if(RESINSIGHT_PRIVATE_INSTALL) # Use file clobbing, as the dlls are decorated with local compiler info file(GLOB RI_BOOST_DLLS ${_dir}/boost_filesystem*.dll) - message("RI_BOOST_DLLS : ${RI_BOOST_DLLS}") - install( FILES ${RI_BOOST_DLLS} DESTINATION ${RESINSIGHT_INSTALL_FOLDER} diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt index 5a17b7a52a..4d14dc7e95 100644 --- a/ApplicationLibCode/CMakeLists.txt +++ b/ApplicationLibCode/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(ApplicationLibCode) # set packaging dir diff --git a/ApplicationLibCode/Commands/CMakeLists.txt b/ApplicationLibCode/Commands/CMakeLists.txt index e21063582f..3f09d8ad99 100644 --- a/ApplicationLibCode/Commands/CMakeLists.txt +++ b/ApplicationLibCode/Commands/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(Commands) # Unity Build diff --git a/ApplicationLibCode/GeoMech/GeoMechDataModel/CMakeLists.txt b/ApplicationLibCode/GeoMech/GeoMechDataModel/CMakeLists.txt index db22d5201a..1ee27604d6 100644 --- a/ApplicationLibCode/GeoMech/GeoMechDataModel/CMakeLists.txt +++ b/ApplicationLibCode/GeoMech/GeoMechDataModel/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(RigGeoMechDataModel) # Unity Build diff --git a/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt b/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt index 6685100e92..ee5362f407 100644 --- a/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt +++ b/ApplicationLibCode/GeoMech/OdbReader/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(RifOdbReader) # Unity Build diff --git a/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt b/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt index 4d5325a1f2..843fbb5d2c 100644 --- a/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt +++ b/ApplicationLibCode/ResultStatisticsCache/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(ResultStatisticsCache) include_directories(${LibCore_SOURCE_DIR}) diff --git a/CMakeLists.txt b/CMakeLists.txt index d356f2c0a9..2988fa79b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(VIZ_MODULES_FOLDER_NAME Fwk/VizFwk) cmake_policy(SET CMP0020 NEW) if(POLICY CMP0077) - cmake_policy(SET CMP0077 OLD) + cmake_policy(SET CMP0077 NEW) endif() if(UNIX) @@ -504,6 +504,7 @@ list(APPEND THIRD_PARTY_LIBRARIES clipper) add_subdirectory(ThirdParty/roffcpp) list(APPEND THIRD_PARTY_LIBRARIES roffcpp) +set_property(TARGET roffcpp-tests gtest gtest_main PROPERTY FOLDER "Thirdparty") # ############################################################################## # Thirdparty libraries are put in ThirdParty solution folder @@ -615,11 +616,16 @@ add_subdirectory(Fwk/AppFwk/cafTensor) add_subdirectory(Fwk/AppFwk/cafHexInterpolator) if(MSVC) - target_compile_options(cafViewer PRIVATE /wd4996) - target_compile_options(cafPdmCore PRIVATE /wd4996) + target_compile_options(cafAnimControl PRIVATE /wd5054) + target_compile_options(cafViewer PRIVATE /wd4996 /wd5054) target_compile_options(cafPdmCore PRIVATE /wd4996) + target_compile_options(cafPdmUiCore PRIVATE /wd5054) + target_compile_options(cafCommandFeatures PRIVATE /wd4996 /wd5054) + target_compile_options(cafCommand PRIVATE /wd5054) target_compile_options(cafPdmXml PRIVATE /wd4996) - target_compile_options(cafUserInterface PRIVATE /wd4996) + target_compile_options(cafUserInterface PRIVATE /wd4996 /wd5054) + target_compile_options(qwt PRIVATE /wd5055) + target_compile_options(CommonCode PRIVATE /wd5054) endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") diff --git a/Fwk/AppFwk/CommonCode/CMakeLists.txt b/Fwk/AppFwk/CommonCode/CMakeLists.txt index 265d2f508f..9a78a8b941 100644 --- a/Fwk/AppFwk/CommonCode/CMakeLists.txt +++ b/Fwk/AppFwk/CommonCode/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(CommonCode) # Unity Build diff --git a/Fwk/AppFwk/CommonCode/cafContourLines.cpp b/Fwk/AppFwk/CommonCode/cafContourLines.cpp index b7322626a5..586f843e22 100644 --- a/Fwk/AppFwk/CommonCode/cafContourLines.cpp +++ b/Fwk/AppFwk/CommonCode/cafContourLines.cpp @@ -217,7 +217,6 @@ std::vector caf::ContourLines::create( co const std::vector& yPositions, const std::vector& contourLevels ) { - const double eps = 1.0e-4; std::vector> contourLineSegments; caf::ContourLines::create( dataXY, xPositions, yPositions, contourLevels, &contourLineSegments ); diff --git a/Fwk/AppFwk/cafAnimControl/CMakeLists.txt b/Fwk/AppFwk/cafAnimControl/CMakeLists.txt index a312c2a722..c2ae404234 100644 --- a/Fwk/AppFwk/cafAnimControl/CMakeLists.txt +++ b/Fwk/AppFwk/cafAnimControl/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafAnimControl) # Unity Build diff --git a/Fwk/AppFwk/cafCommand/CMakeLists.txt b/Fwk/AppFwk/cafCommand/CMakeLists.txt index 5c881804b4..fa20397a09 100644 --- a/Fwk/AppFwk/cafCommand/CMakeLists.txt +++ b/Fwk/AppFwk/cafCommand/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafCommand) # Unity Build diff --git a/Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt b/Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt index 824774da4e..d335bb5e28 100644 --- a/Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt +++ b/Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafCommandFeatures) # Unity Build diff --git a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt index 8b6ba0d3c3..12d5ce7861 100644 --- a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafPdmCvf) # Unity Build diff --git a/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt b/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt index 1b546e73c8..8e15f67069 100644 --- a/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafPdmScripting) option(CAF_CVF_SCRIPTING "Enable CVF-data support in Scripting" OFF) diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/CMakeLists.txt index 946793e218..56c0e0288e 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) - project(cafPdmScripting_UnitTests) find_package( @@ -13,10 +11,6 @@ if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) # VS 2017 : Disable warnings from from gtest code, using deprecated code # related to TR1 add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) - message( - STATUS - "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - ) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp diff --git a/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt index ea2fa22cac..cd1c8b3cca 100644 --- a/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafProjectDataModel) # Unity Build diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt index 40d4e76c70..02c22933e7 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafPdmCore) # Unity Build diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.h index 0fcff65404..464017b11b 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafAppEnum.h @@ -108,9 +108,6 @@ public: { } - bool operator==( T value ) const { return m_value == value; } - bool operator!=( T value ) const { return m_value != value; } - operator T() const { return m_value; } T value() const { return m_value; } @@ -346,22 +343,6 @@ private: } // namespace caf -//================================================================================================== -/// Cant remember why we need those comparison operators... -//================================================================================================== - -template -bool operator==( T value, const caf::AppEnum& appEnum ) -{ - return ( appEnum == value ); -} - -template -bool operator!=( T value, const caf::AppEnum& appEnum ) -{ - return ( appEnum != value ); -} - //================================================================================================== /// Implementation of stream operators to make PdmField > work smoothly /// Assumes that the stream ends at the end of the enum text diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt index 14743e48c4..b4a9a6e850 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.15) project(cafPdmCore_UnitTests) @@ -14,10 +14,6 @@ if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) # VS 2017 : Disable warnings from from gtest code, using deprecated code # related to TR1 add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) - message( - STATUS - "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - ) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt index 678fb2e06b..9c9365e159 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafPdmUiCore) # Unity Build diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp index 683da30eaf..305e81d1ed 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp @@ -84,7 +84,7 @@ QSize QShortenedLabel::minimumSizeHint() const QFontMetrics fontMetrics = QApplication::fontMetrics(); QString fullLabelText = fullText(); QString shortenedText = fullLabelText.left( minimumNumberOfCharacters ); - int minimumWidth = fontMetrics.width( shortenedText ); + int minimumWidth = fontMetrics.horizontalAdvance( shortenedText ); if ( !fullLabelText.isEmpty() ) { @@ -94,12 +94,12 @@ QSize QShortenedLabel::minimumSizeHint() const QStringList labelLines = fullLabelText.split( "\n" ); for ( QString line : labelLines ) { - int lineWidth = fontMetrics.width( line ); + int lineWidth = fontMetrics.horizontalAdvance( line ); maxLineWidth = std::max( maxLineWidth, lineWidth ); QStringList words = line.split( " " ); if ( !words.empty() ) { - int wordWidth = fontMetrics.width( words.front() + "..." ); + int wordWidth = fontMetrics.horizontalAdvance( words.front() + "..." ); maxFirstWordWidth = std::max( maxFirstWordWidth, wordWidth ); } } @@ -127,7 +127,7 @@ QSize QShortenedLabel::sizeHint() const int maxLineWidth = 0; for ( const QString& line : labelLines ) { - maxLineWidth = std::max( maxLineWidth, fontMetrics.width( line ) ); + maxLineWidth = std::max( maxLineWidth, fontMetrics.horizontalAdvance( line ) ); } // increase size hint with a few pixels to avoid linux gui issues @@ -156,7 +156,7 @@ void caf::QShortenedLabel::resizeText( QSize paintSize ) int maxLineWidth = 0; for ( const QString& line : labelLines ) { - maxLineWidth += fontMetrics.width( line ); + maxLineWidth += fontMetrics.horizontalAdvance( line ); } if ( maxLineWidth < paintSize.width() ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt index d05661cac8..4954ad8497 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafPdmXml) # Unity Build diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt index b1aca842c3..4a44bcfcbe 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.15) project(cafPdmXml_UnitTests) @@ -13,10 +13,6 @@ if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) # VS 2017 : Disable warnings from from gtest code, using deprecated code # related to TR1 add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) - message( - STATUS - "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - ) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp diff --git a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt index ef58eb40b1..97e566aace 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.15) project(cafProjectDataModel_UnitTests) @@ -14,10 +14,6 @@ if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) # VS 2017 : Disable warnings from from gtest code, using deprecated code # related to TR1 add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) - message( - STATUS - "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" - ) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp diff --git a/Fwk/AppFwk/cafTensor/CMakeLists.txt b/Fwk/AppFwk/cafTensor/CMakeLists.txt index fefb25d3fa..2c4a3421f7 100644 --- a/Fwk/AppFwk/cafTensor/CMakeLists.txt +++ b/Fwk/AppFwk/cafTensor/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafTensor) set(PROJECT_FILES cafTensor3.cpp cafTensor3.h cafTensor3.inl) diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt index 42151a1089..92f8557dd6 100644 --- a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt +++ b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.15) project(cafTestApplication) diff --git a/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt b/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt index 2715b3567b..d92f1079aa 100644 --- a/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt +++ b/Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.15) project(cafTestCvfApplication) diff --git a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt index 74f1cdca3c..6bab3b419f 100644 --- a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt +++ b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafUserInterface) # Unity Build diff --git a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt index 8618b25be2..d22efbb782 100644 --- a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.15) project(cafUserInterface_UnitTests) diff --git a/Fwk/AppFwk/cafViewer/CMakeLists.txt b/Fwk/AppFwk/cafViewer/CMakeLists.txt index 6d14359ce3..3563c7b006 100644 --- a/Fwk/AppFwk/cafViewer/CMakeLists.txt +++ b/Fwk/AppFwk/cafViewer/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafViewer) # Unity Build diff --git a/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt b/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt index 509082cd05..464207036f 100644 --- a/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt +++ b/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(cafVizExtensions) # Unity Build diff --git a/Fwk/VizFwk/LibCore/CMakeLists.txt b/Fwk/VizFwk/LibCore/CMakeLists.txt index ef1dea2c0a..d8e5555831 100644 --- a/Fwk/VizFwk/LibCore/CMakeLists.txt +++ b/Fwk/VizFwk/LibCore/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - project(LibCore) # CMake Unity Build diff --git a/Fwk/VizFwk/LibGeometry/CMakeLists.txt b/Fwk/VizFwk/LibGeometry/CMakeLists.txt index 11f45a2d56..00c9018dd8 100644 --- a/Fwk/VizFwk/LibGeometry/CMakeLists.txt +++ b/Fwk/VizFwk/LibGeometry/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(LibGeometry) # CMake Unity Build diff --git a/Fwk/VizFwk/LibGuiQt/CMakeLists.txt b/Fwk/VizFwk/LibGuiQt/CMakeLists.txt index 3a30fd069e..f0c5385f35 100644 --- a/Fwk/VizFwk/LibGuiQt/CMakeLists.txt +++ b/Fwk/VizFwk/LibGuiQt/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(LibGuiQt) # CMake Unity Build diff --git a/Fwk/VizFwk/LibRender/CMakeLists.txt b/Fwk/VizFwk/LibRender/CMakeLists.txt index 374597e4c4..c1b52c3543 100644 --- a/Fwk/VizFwk/LibRender/CMakeLists.txt +++ b/Fwk/VizFwk/LibRender/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(LibRender) # Unity Build diff --git a/Fwk/VizFwk/LibViewing/CMakeLists.txt b/Fwk/VizFwk/LibViewing/CMakeLists.txt index 8a84dcd73e..9791df3539 100644 --- a/Fwk/VizFwk/LibViewing/CMakeLists.txt +++ b/Fwk/VizFwk/LibViewing/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(LibViewing) # CMake Unity Build diff --git a/GrpcInterface/CMakeLists.txt b/GrpcInterface/CMakeLists.txt index a88432b6df..94cedb6b23 100644 --- a/GrpcInterface/CMakeLists.txt +++ b/GrpcInterface/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.12) - project(GrpcInterface) message(STATUS "GRPC enabled") diff --git a/ThirdParty/custom-opm-common/CMakeLists.txt b/ThirdParty/custom-opm-common/CMakeLists.txt index c8f935dddc..33b54f09f2 100644 --- a/ThirdParty/custom-opm-common/CMakeLists.txt +++ b/ThirdParty/custom-opm-common/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) # Languages and global compiler settings if(CMAKE_VERSION VERSION_LESS 3.8) diff --git a/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt b/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt index 7465bf21f7..86f36e8611 100644 --- a/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt +++ b/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project ( opm-parser-tests ) @@ -15,7 +15,6 @@ endif() if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) # VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) - message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") endif() CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/OpmTestDataDirectory.h.cmake diff --git a/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt b/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt index 7b1eab0405..a9c22ebe98 100644 --- a/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt +++ b/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (custom-opm-flowdiagnostics)