-
Notifications
You must be signed in to change notification settings - Fork 239
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FileIO modularization: first part #1182
Conversation
7c5c6fb
to
4ee3bcd
Compare
if(QT4_FOUND) | ||
target_link_libraries(BaseLib PUBLIC Qt4::QtXml Qt4::QtXmlPatterns) | ||
if(WIN32 AND CMAKE_CROSSCOMPILING) | ||
find_package(OpenSSL) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you move this to Find.cmake?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Put this in scripts/cmake/Find.cmake
:
find_package(OpenSSL)
And this into the CMakeLists.txt
-file:
if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND)
target_link_libraries(BaseLib PUBLIC Qt4::QtNetwork ${OPENSSL_LIBRARIES} ws2_32)
endif()
b6191f2
to
bb4a666
Compare
looks ok. please resolve conflicts |
if(QT4_FOUND) | ||
target_link_libraries(BaseLib PUBLIC Qt4::QtXml Qt4::QtXmlPatterns) | ||
if(WIN32 AND CMAKE_CROSSCOMPILING AND OPENSSL_FOUND) | ||
target_link_libraries(BaseLib PUBLIC Qt4::QtNetwork ${OPENSSL_LIBRARIES} ws2_32) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The explicit PUBLIC
and INTERFACE
keywords in all of the target_link_libraries
are removed now. The default behaviour (transitive) is sufficient, no need for finer grained dependencies for now.
04efecb
to
c489b85
Compare
Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1678/ |
Jenkins: OGS-6/Gui/Gui-Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Gui-Linux-PRs/1795/ |
Jenkins: OGS-6/Gui/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Mac-PRs/1690/ |
Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1828/ |
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/50/ |
👍 |
Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/51/ |
Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1831/ |
2e3a8df
to
d273de8
Compare
Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1834/ |
d273de8
to
9d02593
Compare
@TomFischer there is a small addendum in your PRs |
+ Update the namespace from FileIO to IO. + move Legacy/OGSIOVer4* to GeoLib/IO.
Move parts from FileIO to GeoLib/IO and BaseLib/IO.
In order to make OGS more modular: - The {read/write}Mesh{From/To}File.{h,cpp} are moved from FileIO to MeshLib/IO. - The FileIO/Legacy folder was moved to MeshLib/IO/Legacy. - Include paths are changed according the changes above.
FileIO -> MeshLib::IO.
Remove unneeded and transitively included libraries. Mainly substituting FileIO with appropriate Mesh/GeoLib.
d244e20
to
ead641e
Compare
OpenGeoSys development has been moved to GitLab. |
In order to remove dependencies the PR is the first step of modularization, see issue https://github.com/ufz/ogs/issues/1164. The PR is mainly moving files and change namespaces. There isn't any new line of code except the CMakeLists.txt's.