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

[CMake] Remove if(CMAKE_CROSSCOMPILING).

parent c06043c4
No related branches found
No related tags found
No related merge requests found
...@@ -71,14 +71,6 @@ if(OGS_USE_CONAN AND WIN32) ...@@ -71,14 +71,6 @@ if(OGS_USE_CONAN AND WIN32)
target_link_libraries(DataExplorer ${ZLIB_LIBRARIES}) target_link_libraries(DataExplorer ${ZLIB_LIBRARIES})
endif() endif()
if(CMAKE_CROSSCOMPILING)
target_link_libraries(DataExplorer
${QT_XML_DEPS_LIBRARIES}
${QT_GUI_DEPS_LIBRARIES}
${QT_NETWORK_DEPS_LIBRARIES}
)
endif()
if(GEOTIFF_FOUND) if(GEOTIFF_FOUND)
target_link_libraries(DataExplorer ${GEOTIFF_LIBRARIES} ) target_link_libraries(DataExplorer ${GEOTIFF_LIBRARIES} )
endif() endif()
......
...@@ -27,9 +27,6 @@ endif() ...@@ -27,9 +27,6 @@ endif()
if(Qt5XmlPatterns_FOUND) if(Qt5XmlPatterns_FOUND)
target_link_libraries(BaseLib PUBLIC Qt5::Xml Qt5::XmlPatterns) target_link_libraries(BaseLib PUBLIC Qt5::Xml Qt5::XmlPatterns)
if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
target_link_libraries(BaseLib PUBLIC Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
endif()
endif() endif()
if(OGS_USE_PCH) if(OGS_USE_PCH)
......
...@@ -20,9 +20,6 @@ target_link_libraries(GeoLib PUBLIC BaseLib MathLib logog PRIVATE tet) ...@@ -20,9 +20,6 @@ target_link_libraries(GeoLib PUBLIC BaseLib MathLib logog PRIVATE tet)
if(Qt5XmlPatterns_FOUND) if(Qt5XmlPatterns_FOUND)
target_link_libraries(GeoLib PUBLIC Qt5::Xml Qt5::XmlPatterns) target_link_libraries(GeoLib PUBLIC Qt5::Xml Qt5::XmlPatterns)
if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
target_link_libraries(GeoLib PUBLIC Qt5::Network ${OPENSSL_LIBRARIES} ws2_32)
endif()
endif() endif()
if(OGS_USE_PCH) if(OGS_USE_PCH)
......
...@@ -73,12 +73,6 @@ endif() ...@@ -73,12 +73,6 @@ endif()
if(Qt5XmlPatterns_FOUND) if(Qt5XmlPatterns_FOUND)
target_link_libraries(testrunner Qt5::Core Qt5::Gui Qt5::Xml Qt5::Network VtkVis QtDataView) target_link_libraries(testrunner Qt5::Core Qt5::Gui Qt5::Xml Qt5::Network VtkVis QtDataView)
if(CMAKE_CROSSCOMPILING)
target_link_libraries(testrunner
${QT_XML_DEPS_LIBRARIES}
${QT_GUI_DEPS_LIBRARIES}
${QT_NETWORK_DEPS_LIBRARIES})
endif()
endif() endif()
if(OGS_USE_PCH) if(OGS_USE_PCH)
......
...@@ -61,9 +61,6 @@ find_package(Eigen3 3.3.4 REQUIRED) ...@@ -61,9 +61,6 @@ find_package(Eigen3 3.3.4 REQUIRED)
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR}) include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
## pthread, is a requirement of logog ## ## pthread, is a requirement of logog ##
if(CMAKE_CROSSCOMPILING)
set(THREADS_PTHREAD_ARG 0 CACHE STRING "Result from TRY_RUN" FORCE)
endif()
set(CMAKE_THREAD_PREFER_PTHREAD ON) set(CMAKE_THREAD_PREFER_PTHREAD ON)
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
...@@ -94,15 +91,6 @@ if(OGS_BUILD_GUI) ...@@ -94,15 +91,6 @@ if(OGS_BUILD_GUI)
endif() endif()
find_package(Qt5 5.2 REQUIRED ${QT_MODULES}) find_package(Qt5 5.2 REQUIRED ${QT_MODULES})
cmake_policy(SET CMP0020 NEW) cmake_policy(SET CMP0020 NEW)
if(CMAKE_CROSSCOMPILING)
find_package(PkgConfig REQUIRED)
pkg_check_modules(QT_XML_DEPS REQUIRED Xml)
list(REMOVE_ITEM QT_XML_DEPS_LIBRARIES Xml Core)
pkg_check_modules(QT_GUI_DEPS REQUIRED Gui)
list(REMOVE_ITEM QT_GUI_DEPS_LIBRARIES Gui Core)
pkg_check_modules(QT_NETWORK_DEPS REQUIRED Network)
list(REMOVE_ITEM QT_NETWORK_DEPS_LIBRARIES Network Core)
endif()
endif() endif()
if(OGS_USE_NETCDF) if(OGS_USE_NETCDF)
......
...@@ -2,9 +2,6 @@ set(CMAKE_INSTALL_UCRT_LIBRARIES ON) ...@@ -2,9 +2,6 @@ set(CMAKE_INSTALL_UCRT_LIBRARIES ON)
set(CMAKE_INSTALL_OPENMP_LIBRARIES ON) set(CMAKE_INSTALL_OPENMP_LIBRARIES ON)
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
set(CPACK_GENERATOR ZIP) set(CPACK_GENERATOR ZIP)
#if(NOT CMAKE_CROSSCOMPILING)
# set(CPACK_GENERATOR NSIS ZIP)
#endif()
set(CPACK_NSIS_MUI_ICON ${PROJECT_SOURCE_DIR}/scripts/packaging/ogs-de-icon.ico) set(CPACK_NSIS_MUI_ICON ${PROJECT_SOURCE_DIR}/scripts/packaging/ogs-de-icon.ico)
set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.bmp) set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.bmp)
set(CPACK_NSIS_INSTALLED_ICON_NAME ${CPACK_NSIS_MUI_ICON}) set(CPACK_NSIS_INSTALLED_ICON_NAME ${CPACK_NSIS_MUI_ICON})
......
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