OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-28 01:41:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cmake cleanup and selected Qt6 adjustments

Browse Source 
- Avoid warning using newer CMake by removing obsolete cmake requirements in sub projects
- Several adjustments preparing for Qt6
This commit is contained in:
Magne Sjaastad 2024-04-17 15:06:51 +02:00 committed by GitHub
parent 174123f8b5
commit c759a11888
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationExeCode/RiaMain.cpp
View File

@ -181,7 +181,7 @@ int main( int argc, char* argv[] )
if ( file.open( QIODevice::WriteOnly | QIODevice::Text ) )
{
QTextStream out( &file );
out << portNumber << endl;
out << portNumber << "\n";
}
file.close();

1
ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp
View File

@ -38,7 +38,6 @@
#include <QAction>
#include <QClipboard>
#include <QDebug>
#include <QDesktopWidget>
#include <QFileInfo>
#include <QMdiSubWindow>
#include <QPageLayout>

3
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@ -319,8 +319,7 @@ QDateTime RimSummaryTimeAxisProperties::fromDisplayTimeToDate( double displayTim
time_t startOfSimulation = rimSummaryPlot->firstTimeStepOfFirstCurve();
time_t secsSinceSimulationStart = displayTime / fromTimeTToDisplayUnitScale();
QDateTime date;
date.setTime_t( startOfSimulation + secsSinceSimulationStart );
QDateTime date = RiaQDateTimeTools::fromTime_t( startOfSimulation + secsSinceSimulationStart );
return date;
}

1
ApplicationLibCode/UserInterface/RiuMainWindow.cpp
View File

@ -92,6 +92,7 @@
#include "DockManager.h"
#include <QAction>
#include <QActionGroup>
#include <QCloseEvent>
#include <QComboBox>
#include <QDir>

1
ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp
View File

@ -58,7 +58,6 @@
#include "qwt_scale_widget.h"
#include <QDebug>
#include <QDesktopWidget>
#include <QFocusEvent>
#include <QFontMetrics>
#include <QGraphicsDropShadowEffect>

2
Fwk/AppFwk/cafHexInterpolator/cafHexInterpolator.h
View File

@ -39,7 +39,7 @@
/*
Interpolating inside a general 8 node hexahedral element
Calculating an interpolated value at a position inside the element from values at each corner.
Author Jacob Støren
Author Jacob Storen
| v1 |
Vectors: [v] = | v2 | = { v1, v2, v3 }

4
Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
View File

@ -14,6 +14,7 @@ set(MOC_HEADER_FILES MainWindow.h WidgetLayoutTest.h CustomObjectEditor.h
# Resource file
set(QRC_FILES ${QRC_FILES} textedit.qrc)
message("QRC_FILES: ${QRC_FILES}")
if(CEE_USE_QT6)
find_package(
@ -23,6 +24,7 @@ if(CEE_USE_QT6)
)
set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGL Qt6::Svg)
qt_standard_project_setup()
set(CMAKE_AUTORCC ON)
else()
find_package(
Qt5
@ -64,7 +66,7 @@ if(CEE_USE_QT6)
${PROJECT_NAME}
${PROJECT_FILES}
${MOC_SOURCE_FILES}
${QRC_FILES_CPP}
${QRC_FILES}
$<TARGET_OBJECTS:cafCommandFeatures> # Needed for cmake version < 3.12.
# Remove
# when we can use target_link_libraries with OBJECT libraries

2
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@ -42,8 +42,6 @@ add_library(
cafNavigationPolicy.cpp
cafNavigationPolicy.h
cafPointOfInterestVisualizer.h
cafOpenGLWidget.cpp
cafOpenGLWidget.h
cafViewer.cpp
cafViewer.h
${MOC_SOURCE_FILES}

1
ThirdParty/Ert/CMakeLists.txt vendored
View File

@ -1,4 +1,3 @@
cmake_minimum_required( VERSION 2.8.12 ) # If you are creating Python wrappers for Windows, the actual version requirement is 3.4
project( ERT C CXX )
include(GNUInstallDirs)

1
ThirdParty/Ert/external/catch2/CMakeLists.txt vendored
View File

@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(catch2 CXX)
# Dummy source file added because INTERFACE type

2
ThirdParty/NRLib/CMakeLists.txt vendored
View File

@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
project (NRLib)
if (CMAKE_COMPILER_IS_GNUCXX)

6
ThirdParty/NRLib/nrlib/well/laswell.hpp vendored
View File

@ -1,12 +1,12 @@
// $Id: laswell.hpp 1244 2014-02-24 15:57:16Z hauge $
// $Id: laswell.hpp 1244 2014-02-24 15:57:16Z hauge $
// Copyright (c) 2011, Norwegian Computing Center
// All rights reserved.
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
// • Redistributions of source code must retain the above copyright notice, this
// • Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
// • Redistributions in binary form must reproduce the above copyright notice, this list of
// • Redistributions in binary form must reproduce the above copyright notice, this list of
// conditions and the following disclaimer in the documentation and/or other materials
// provided with the distribution.
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY

6
ThirdParty/NRLib/nrlib/well/well.hpp vendored
View File

@ -1,12 +1,12 @@
// $Id: well.hpp 883 2011-09-26 09:17:05Z perroe $
// $Id: well.hpp 883 2011-09-26 09:17:05Z perroe $
// Copyright (c) 2011, Norwegian Computing Center
// All rights reserved.
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
// • Redistributions of source code must retain the above copyright notice, this
// • Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
// • Redistributions in binary form must reproduce the above copyright notice, this list of
// • Redistributions in binary form must reproduce the above copyright notice, this list of
// conditions and the following disclaimer in the documentation and/or other materials
// provided with the distribution.
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY

2
ThirdParty/clipper/CMakeLists.txt vendored
View File

@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
endif()

3
ThirdParty/custom-opm-common/CMakeLists.txt vendored
View File

@ -1,6 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
# Languages and global compiler settings
if(CMAKE_VERSION VERSION_LESS 3.8)
message(WARNING "CMake version does not support c++17, guessing -std=c++17")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")

2
ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt vendored
View File

@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
project (custom-opm-flowdiag-app)
if (CMAKE_COMPILER_IS_GNUCXX)

2
ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt vendored
View File

@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
project (custom-opm-flowdiagnostics)
if (CMAKE_COMPILER_IS_GNUCXX)

2
ThirdParty/expressionparser/CMakeLists.txt vendored
View File

@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
project (expressionparser)
if(MSVC)

2
ThirdParty/nightcharts/CMakeLists.txt vendored
View File

@ -1,5 +1,3 @@
cmake_minimum_required (VERSION 2.8.12)
project (nightcharts)
if (CEE_USE_QT6)