Switch to cmake part1 #2251
Switch to cmake part1 #2251
Conversation
robbr48
left a comment
robbr48
left a comment
There was a problem hiding this comment.
Seems to work except for the DCPLib. It no is no longer compiled and linked since it is header-only. See separate comments in hopsandcp/CMakeLists.txt.
The conflict is just because I fixed the same typo, so it is very easy to fix.
| endif() | ||
|
|
||
| set(CMAKE_AUTOMOC ON) | ||
| include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/dcplib.cmake) |
There was a problem hiding this comment.
We should not include this, since DCPLib is header-only and does no longer require linking.
There was a problem hiding this comment.
OK it was I while ago I wrote this, so lets see If I can remember and complete this work.
I think that the dcplib.cmake setup header-only targets for dcplib (from its own cmake config packages) it also does a bunch of complex magic to figure out if the dependencies of dcp lib are available and what name the libraries have.
Even if dcplib is header only. its dependencies may still need to be linked if they are not header only.
Such as xercses, libzip / zlib, icu (if available)
| #include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/xerces.cmake) | ||
|
|
||
| # include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/xerces.cmake) | ||
| # include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/libzip.cmake) |
There was a problem hiding this comment.
We need to include libzip.cmake, however, because we must link to libzip directly below.
There was a problem hiding this comment.
I moved the libzip setup into dcplib.cmake since it was only a dependency to dcplib, ..... I think.
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/libzip/include> | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/asio-code/include> | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/xerces/include> | ||
| # $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/dcplib-code/include/bluetooth> |
There was a problem hiding this comment.
These include directories are needed, because we need to link to the headers in DCPLib, libzip, Asio and Xerces. But perhaps they should can be in dcplib.cmake if we remove all stuff with linking to the library.
There was a problem hiding this comment.
Yes all of these paths should be added by the targets made available from dcplib.cmake. Most of them are header-only library targets.
| target_link_libraries(hopsandcp hopsancore libzip -lws2_32) | ||
| else() | ||
| target_link_libraries(hopsandcp hopsancore libzip) | ||
| target_link_libraries(hopsandcp hopsancore DCPLib::Master DCPLib::Slave DCPLib::Zip DCPLib::Ethernet) |
There was a problem hiding this comment.
Remove: DCPLib::Master, DCPLib::Slave and DCPLib::Zip
Add: libzip
There was a problem hiding this comment.
Those are the targets defined by the dcplib project, so I wanted to "link" (depend) on them instead of explicitly pointing to the header directories. There may be more properties in these targets (compiler definitions and such things) that may be required. I think that DCPLib::Zip depends on libzip
To prevent re-downloading after cleaning code during test builds
Keep the dir to avoid fetching all code every time
Removes warning spam on newer CMake versions
peterNordin
force-pushed
the
switch_to_cmake_part1
branch
from
3d090aa to
4f9e5fc
Compare
Comment validation tests for now, script does not work
Hopefully it has tar installed in the system
peterNordin
force-pushed
the
switch_to_cmake_part1
branch
from
e9fa0de to
a54ee01
Compare
|
There is something wrong with fmi4c, I get the following error: |
2 participants
This is part one of switch over to CMake, has been in progress for more than three years.
After adding DCP additional work is needed to be able to build release, but i will make a part2
This PR enables me to build all of Hopsan on Linux GCC, Windows MinGW and Windows MSVC 2019.
Including with DCP. But I do not know if it actually works in all these cases. Hopsan at least starts.
Deb build has been migrated to CMake. But flatpak/snap and Windows builds remain.