Skip to content

Fixes and enhancements to CMake build system#54

Merged
Arcnor merged 1 commit intoDescentDevelopers:mainfrom
winterheart:cmake-fixes
Apr 18, 2024
Merged

Fixes and enhancements to CMake build system#54
Arcnor merged 1 commit intoDescentDevelopers:mainfrom
winterheart:cmake-fixes

Conversation

@winterheart
Copy link
Collaborator

Updated compatibility level to 3.19. Set C++17 globally for all platforms. Removed hardcoded compiler and optimisation flags. Adjusted dependencies and libraries linking.

Reworked script building and hog creation.

Updated compatibility level to 3.19. Set C++17 globally for all platforms. Removed hardcoded compiler and optimisation flags. Adjusted dependencies and libraries linking.

Reworked script building and hog creation.
@winterheart winterheart added this to the All platforms building milestone Apr 18, 2024
ADD_CUSTOM_COMMAND(
TARGET ${SCRIPT}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${SCRIPT}> "${CMAKE_SOURCE_DIR}/scripts/data/linuxfullhog/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll have to revisit this, copying into the source directory is not very clean, this should probably be the binary one, then some extra code to deal with whatever needs to happen to those files later (install them?)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was thinking on it. Will rework this some day.

SET(CMAKE_CXX_EXTENSIONS OFF)
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)

SET (D3_GAMEDIR "~/Descent3/")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

D3_GAMEDIR should be a cache variable set by the user

@Arcnor Arcnor merged commit 099d698 into DescentDevelopers:main Apr 18, 2024
@winterheart winterheart deleted the cmake-fixes branch April 19, 2024 15:04
JeodC pushed a commit that referenced this pull request Apr 28, 2024
Fixes and enhancements to CMake build system
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants