Switch to cmake part1 #2251
Open
Switch to cmake part1 #2251
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
Comment validation tests for now, script does not work
Hopefully it has tar installed in the system
robbr48
requested changes
Apr 17, 2025
| project(hopsandcp) | ||
| set(CMAKE_CXX_STANDARD 14) | ||
| set(CMAKE_DEBUG_POSTFIX _d) | ||
| if(WIN32) | ||
| set(CMAKE_SHARED_LIBRARY_PREFIX "") | ||
| 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.
|
|
||
| # 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.
| $<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.
| 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.