Skip to content
Snippets Groups Projects
Commit b9401e1d authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Replaced QT4_FOUND with Qt5XmlPatterns_FOUND

parent d4f51c10
No related branches found
No related tags found
No related merge requests found
......@@ -2,12 +2,12 @@ GET_SOURCE_FILES(SOURCES)
if(NOT Shapelib_FOUND)
list(REMOVE_ITEM SOURCES SHPInterface.h SHPInterface.cpp)
endif()
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
APPEND_SOURCE_FILES(SOURCES XmlIO/Qt)
endif()
APPEND_SOURCE_FILES(SOURCES Gmsh)
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
APPEND_SOURCE_FILES(SOURCES FEFLOW)
endif()
......@@ -22,7 +22,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
add_library(ApplicationsFileIO ${SOURCES})
target_link_libraries(ApplicationsFileIO DataHolderLib)
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
target_link_libraries(ApplicationsFileIO Qt5::Xml Qt5::XmlPatterns)
if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
target_link_libraries(ApplicationsFileIO Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
......
if (Qt5XmlPatterns_FOUND)
if (Shapelib_FOUND)
add_executable(ConvertSHPToGLI ConvertSHPToGLI.cpp)
set_target_properties(ConvertSHPToGLI PROPERTIES FOLDER Utilities)
target_link_libraries(ConvertSHPToGLI GeoLib Qt5::Xml ${Shapelib_LIBRARIES})
endif()
if (QT4_FOUND AND Shapelib_FOUND)
add_executable(ConvertSHPToGLI ConvertSHPToGLI.cpp)
set_target_properties(ConvertSHPToGLI PROPERTIES FOLDER Utilities)
target_link_libraries(ConvertSHPToGLI GeoLib Qt5::Xml ${Shapelib_LIBRARIES})
endif ()
if (QT4_FOUND)
add_executable(FEFLOW2OGS FEFLOW2OGS.cpp)
set_target_properties(FEFLOW2OGS PROPERTIES FOLDER Utilities)
target_link_libraries(FEFLOW2OGS ApplicationsFileIO)
ADD_VTK_DEPENDENCY(FEFLOW2OGS)
add_executable(convertGEO convertGEO.cpp)
set_target_properties(convertGEO PROPERTIES FOLDER Utilities)
target_link_libraries(convertGEO GeoLib)
endif ()
add_executable(generateMatPropsFromMatID generateMatPropsFromMatID.cpp )
......@@ -43,20 +46,18 @@ set_target_properties(TIN2VTK PROPERTIES FOLDER Utilities)
target_link_libraries(TIN2VTK MeshLib)
ADD_VTK_DEPENDENCY(TIN2VTK)
if (QT4_FOUND)
add_executable(convertGEO convertGEO.cpp)
set_target_properties(convertGEO PROPERTIES FOLDER Utilities)
target_link_libraries(convertGEO GeoLib)
endif()
####################
### Installation ###
####################
install(TARGETS generateMatPropsFromMatID GMSH2OGS OGS2VTK VTK2OGS VTK2TIN
RUNTIME DESTINATION bin COMPONENT ogs_converter)
if(QT4_FOUND)
install(TARGETS ConvertSHPToGLI FEFLOW2OGS convertGEO
if(Qt5XmlPatterns_FOUND)
if(Shapelib_FOUND)
install(TARGETS ConvertSHPToGLI
RUNTIME DESTINATION bin COMPONENT ogs_converter)
endif()
install(TARGETS FEFLOW2OGS convertGEO
RUNTIME DESTINATION bin COMPONENT ogs_converter)
endif()
......
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
add_executable(TriangulatePolyline TriangulatePolyline.cpp)
target_link_libraries(TriangulatePolyline GeoLib)
set_target_properties(TriangulatePolyline PROPERTIES FOLDER Utilities)
......@@ -16,4 +16,4 @@ if(QT4_FOUND)
RUNTIME DESTINATION bin
COMPONENT Utilities
)
endif() # QT4_FOUND
endif()
......@@ -3,7 +3,7 @@ APPEND_SOURCE_FILES(SOURCES IO)
APPEND_SOURCE_FILES(SOURCES IO/XmlIO)
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Qt)
endif()
......@@ -22,7 +22,7 @@ if(MSVC)
target_link_libraries(BaseLib WinMM) # needed for timeGetTime
endif()
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
target_link_libraries(BaseLib Qt5::Xml Qt5::XmlPatterns)
if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
target_link_libraries(BaseLib Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
......
......@@ -7,7 +7,7 @@ APPEND_SOURCE_FILES(SOURCES IO/Legacy)
APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Rapid)
APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Boost)
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
APPEND_SOURCE_FILES(SOURCES IO/XmlIO/Qt)
endif()
......@@ -20,7 +20,7 @@ target_link_libraries(GeoLib
MathLib
)
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
target_link_libraries(GeoLib Qt5::Xml Qt5::XmlPatterns)
if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
target_link_libraries(GeoLib Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
......
......@@ -20,7 +20,7 @@ APPEND_SOURCE_FILES(TEST_SOURCES NumLib)
APPEND_SOURCE_FILES(TEST_SOURCES ProcessLib)
APPEND_SOURCE_FILES(TEST_SOURCES ProcessLib/LiquidFlow)
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
APPEND_SOURCE_FILES(TEST_SOURCES FileIO_Qt)
endif()
......@@ -68,7 +68,7 @@ if(OGS_BUILD_SWMM)
target_link_libraries(testrunner SwmmInterface)
endif()
if(QT4_FOUND)
if(Qt5XmlPatterns_FOUND)
target_link_libraries(testrunner Qt5::Core Qt5::Gui Qt5::Xml Qt5::Network)
if(CMAKE_CROSSCOMPILING)
target_link_libraries(testrunner
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment