diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt index 34ae9ddab987cd92e5d5ad224df962e573b4d82b..571e495b1d8c4aeb1484bae5fb099c598710eeea 100644 --- a/Applications/Utils/GeoTools/CMakeLists.txt +++ b/Applications/Utils/GeoTools/CMakeLists.txt @@ -12,7 +12,7 @@ if(QT4_FOUND) BaseLib FileIO MathLib - ${QT_LIBRARIES} + Qt4::QtCore ) set_target_properties(TriangulatePolyline PROPERTIES FOLDER Utilities) install(TARGETS diff --git a/Applications/Utils/GeoTools/TriangulatePolyline.cpp b/Applications/Utils/GeoTools/TriangulatePolyline.cpp index a014d207b73149ef7f2c7148c10577a2d7038a63..258cc59c33111a03969f9acf29ab757b11e19eea 100644 --- a/Applications/Utils/GeoTools/TriangulatePolyline.cpp +++ b/Applications/Utils/GeoTools/TriangulatePolyline.cpp @@ -23,7 +23,7 @@ #include "GeoLib/GEOObjects.h" #include "GeoLib/Polyline.h" -#include <QApplication> +#include <QCoreApplication> std::string output_question() @@ -37,7 +37,7 @@ std::string output_question() int main(int argc, char *argv[]) { - QApplication app(argc, argv, false); + QCoreApplication app(argc, argv, false); LOGOG_INITIALIZE(); BaseLib::LogogSimpleFormatter *custom_format (new BaseLib::LogogSimpleFormatter); diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt index 5e9e2110dc19c37c947a72cee6e5f3d859f9e1fd..1bca0002be5609ef76394e5a57c6baf5843492bd 100644 --- a/Applications/Utils/MeshEdit/CMakeLists.txt +++ b/Applications/Utils/MeshEdit/CMakeLists.txt @@ -20,7 +20,7 @@ if(QT4_FOUND) MeshLib InSituLib ${CATALYST_LIBRARIES} - ${QT_LIBRARIES} + Qt4::QtCore ) ADD_CATALYST_DEPENDENCY(moveMeshNodes) set_target_properties(moveMeshNodes PROPERTIES FOLDER Utilities) diff --git a/Applications/Utils/MeshEdit/moveMeshNodes.cpp b/Applications/Utils/MeshEdit/moveMeshNodes.cpp index ed76efbc1286a752edefb4385f0298b5bb6c6408..38be498f68e1b36fac5728e6bab6cd9fe7249615 100644 --- a/Applications/Utils/MeshEdit/moveMeshNodes.cpp +++ b/Applications/Utils/MeshEdit/moveMeshNodes.cpp @@ -3,7 +3,7 @@ * 2012/03/07 KR Initial implementation */ -#include <QApplication> +#include <QCoreApplication> #include "logog/include/logog.hpp" #include "LogogSimpleFormatter.h" #include "readMeshFromFile.h" @@ -47,7 +47,7 @@ bool containsPoint(MeshLib::Node const& pnt, MathLib::Point3d const& min, int main (int argc, char* argv[]) { - QApplication app(argc, argv, false); + QCoreApplication app(argc, argv, false); LOGOG_INITIALIZE(); logog::Cout* logogCout = new logog::Cout; BaseLib::LogogSimpleFormatter* formatter = new BaseLib::LogogSimpleFormatter; diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt index 6e5d9832314091d00b8ed2c7a55e5a2d713b50c8..41632410e30a8843bde46518d89354142c6256de 100644 --- a/Applications/Utils/OGSFileConverter/CMakeLists.txt +++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt @@ -4,6 +4,8 @@ cmake_minimum_required(VERSION 2.8.3) # Project name project(OGSFileConverter) +cmake_policy(SET CMP0020 NEW) + # Source files set(SOURCES FileListDialog.cpp