Clean up CMake. #498

OmniBlade · 2025-03-25T15:46:33Z

Removed the #pragma comment linker instructions embedded in the code.
Removes the various alternate names for different libraries.
Refactors build types to all be options.
Cleans up presets so win32 can also be used as an msvc preset.
Moves compiler specific configuration to its own compilers.cmake file as much as possible.

xezon

If you plan to Merge with Rebase, please append (#498) to the commit titles.

GeneralsMD/Code/Libraries/Source/debug/debug.h

xezon

Looks ok to me when the remaining linker error(s) are fixed.

Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp

DevGeniusCode

I ran the default win32 and debug mode, all work properly including install.
~~There is a problem with vc6 in default mode with FetchContent, in debug mode it works fine.~~
VC6 also work fine.
I did not test int and prof

CMakePresets.json

xezon

Looks good.

Minor: I would have put some space after tag in commits:

[CMake]Move compiler configuration to its own cmake file.
       ^ space

So it does not look as cramped.

xezon · 2025-03-26T11:00:03Z

CMakeLists.txt

+    # Because we set CMAKE_CXX_STANDARD_REQUIRED and CMAKE_CXX_EXTENSIONS in the compilers.cmake this should be enforced.
+    target_compile_features(gz_config INTERFACE cxx_std_20)
+endif()
+
 target_compile_options(gz_config INTERFACE ${GENZH_FLAGS})

 target_compile_definitions(gz_config INTERFACE $<IF:$<CONFIG:Debug>,_DEBUG WWDEBUG DEBUG,_RELEASE>)


Perhaps gz_config can also be moved into a config.cmake in a future change.

Cleans up sub library naming as libraries are now named based on target name and don't vary based on build options.

) Files cause issues on 64bit and aren't required.

Generals/CMakeLists.txt

Generals/Code/Tools/CMakeLists.txt

Generals/CMakeLists.txt

cmake/lzhl.cmake

Files cause issues on 64bit and aren't required.

GENZH_BUILD_%GAME%_TOOLS now defaults to ON and builds only tools a developer would use/need. GENZH_BUILD_%GAME%_EXTRAS has been added and defaults to OFF. It controls building everything else. All useful tools are now added to the install target.

Cleans up sub library naming as libraries are now named based on target name and don't vary based on build options.

Files cause issues on 64bit and aren't required.

…perHackers#498) Cleans up sub library naming as libraries are now named based on target name and don't vary based on build options.

…ackers#498)

) Files cause issues on 64bit and aren't required.

GENZH_BUILD_%GAME%_TOOLS now defaults to ON and builds only tools a developer would use/need. GENZH_BUILD_%GAME%_EXTRAS has been added and defaults to OFF. It controls building everything else. All useful tools are now added to the install target.

OmniBlade requested review from xezon and DevGeniusCode March 25, 2025 15:46

xezon reviewed Mar 25, 2025

View reviewed changes

GeneralsMD/Code/Libraries/Source/debug/debug.h Outdated Show resolved Hide resolved

OmniBlade force-pushed the fixes/cleanup-cmake branch from beb4062 to 42515d3 Compare March 25, 2025 16:33

xezon approved these changes Mar 25, 2025

View reviewed changes

Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp Show resolved Hide resolved

DevGeniusCode reviewed Mar 25, 2025

View reviewed changes

DevGeniusCode approved these changes Mar 25, 2025

View reviewed changes

DevGeniusCode reviewed Mar 25, 2025

View reviewed changes

CMakePresets.json Show resolved Hide resolved

DevGeniusCode added Build Anything related to building, compiling Generals Related Generals only ZeroHour Relates to Zero Hour labels Mar 25, 2025

DevGeniusCode mentioned this pull request Mar 25, 2025

Add Visual Studio 2022 Build Guide TheSuperHackers/GeneralsWiki#35

Merged

tintinhamans mentioned this pull request Mar 25, 2025

Implement CI for VS2022 Builds #494

Closed

10 tasks

tintinhamans linked an issue Mar 26, 2025 that may be closed by this pull request

Implement CI for VS2022 Builds #494

Closed

10 tasks

tintinhamans removed a link to an issue Mar 26, 2025

Implement CI for VS2022 Builds #494

Closed

10 tasks

This was referenced Mar 26, 2025

Update vs6 guide TheSuperHackers/GeneralsWiki#36

Closed

Update CLion and MSVC6 build instructions for new CMake configuration TheSuperHackers/GeneralsWiki#37

Merged

OmniBlade force-pushed the fixes/cleanup-cmake branch 3 times, most recently from b3706fc to 06fe5e7 Compare March 26, 2025 10:44

OmniBlade marked this pull request as ready for review March 26, 2025 10:55

xezon approved these changes Mar 26, 2025

View reviewed changes

OmniBlade added 5 commits March 26, 2025 11:06

[CMake] Stop features being printed out 3 times. (#498)

037b7c7

[CMake] Fix deprecation warning in benchmark stub. (#498)

40e6d0a

[GEN][ZH] Remove "pragma comment" implict linker instructions. (#498)

e024113

Cleans up sub library naming as libraries are now named based on target name and don't vary based on build options.

[CMake] Move compiler configuration to its own cmake file. (#498)

f88f15f

[CMake] Refactor CMake build config options. (#498)

f9aafa7

OmniBlade force-pushed the fixes/cleanup-cmake branch from 06fe5e7 to 693a006 Compare March 26, 2025 11:07

tintinhamans pushed a commit to tintinhamans/GeneralsGameCode that referenced this pull request Mar 26, 2025

[CMake] Remove unused code from lzhl library build. (TheSuperHackers#498

693a006

) Files cause issues on 64bit and aren't required.

OmniBlade requested a review from DevGeniusCode March 26, 2025 13:15

xezon approved these changes Mar 26, 2025

View reviewed changes

Generals/CMakeLists.txt Outdated Show resolved Hide resolved

Generals/Code/Tools/CMakeLists.txt Outdated Show resolved Hide resolved

Generals/Code/Tools/CMakeLists.txt Outdated Show resolved Hide resolved

Generals/CMakeLists.txt Show resolved Hide resolved

OmniBlade force-pushed the fixes/cleanup-cmake branch from 09770a8 to 29eb00e Compare March 26, 2025 13:55

OmniBlade requested a review from xezon March 26, 2025 13:57

xezon approved these changes Mar 26, 2025

View reviewed changes

cmake/lzhl.cmake Show resolved Hide resolved

DevGeniusCode approved these changes Mar 26, 2025

View reviewed changes

OmniBlade added 2 commits March 26, 2025 14:57

[CMake] Remove unused code from lzhl library build. (#498)

13689ff

Files cause issues on 64bit and aren't required.

OmniBlade force-pushed the fixes/cleanup-cmake branch from 29eb00e to 8ca02a0 Compare March 26, 2025 14:57

OmniBlade merged commit 45b45cb into TheSuperHackers:main Mar 26, 2025
9 checks passed

OmniBlade added a commit that referenced this pull request Mar 26, 2025

[CMake] Stop features being printed out 3 times. (#498)

b3a4d51

OmniBlade added a commit that referenced this pull request Mar 26, 2025

[CMake] Fix deprecation warning in benchmark stub. (#498)

f15498b

OmniBlade added a commit that referenced this pull request Mar 26, 2025

[GEN][ZH] Remove "pragma comment" implict linker instructions. (#498)

6225457

Cleans up sub library naming as libraries are now named based on target name and don't vary based on build options.

OmniBlade added a commit that referenced this pull request Mar 26, 2025

[CMake] Move compiler configuration to its own cmake file. (#498)

8caba67

OmniBlade added a commit that referenced this pull request Mar 26, 2025

[CMake] Refactor CMake build config options. (#498)

cc43bc3

OmniBlade added a commit that referenced this pull request Mar 26, 2025

[CMake] Remove unused code from lzhl library build. (#498)

fac5332

Files cause issues on 64bit and aren't required.

OmniBlade deleted the fixes/cleanup-cmake branch March 26, 2025 15:38

PiecePaperCode pushed a commit to PiecePaperCode/GeneralsGameCode that referenced this pull request Mar 28, 2025

[CMake] Stop features being printed out 3 times. (TheSuperHackers#498)

bc3c9c0

PiecePaperCode pushed a commit to PiecePaperCode/GeneralsGameCode that referenced this pull request Mar 28, 2025

[CMake] Fix deprecation warning in benchmark stub. (TheSuperHackers#498)

0e0d8df

PiecePaperCode pushed a commit to PiecePaperCode/GeneralsGameCode that referenced this pull request Mar 28, 2025

[CMake] Move compiler configuration to its own cmake file. (TheSuperH…

6e9cd60

…ackers#498)

PiecePaperCode pushed a commit to PiecePaperCode/GeneralsGameCode that referenced this pull request Mar 28, 2025

[CMake] Refactor CMake build config options. (TheSuperHackers#498)

6513d83

PiecePaperCode pushed a commit to PiecePaperCode/GeneralsGameCode that referenced this pull request Mar 28, 2025

[CMake] Remove unused code from lzhl library build. (TheSuperHackers#498

bb24b55

) Files cause issues on 64bit and aren't required.

xezon added this to the Code foundation build up milestone Mar 31, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up CMake. #498

Clean up CMake. #498

OmniBlade commented Mar 25, 2025

xezon left a comment •

edited

Loading

xezon left a comment

DevGeniusCode left a comment •

edited

Loading

xezon left a comment

xezon Mar 26, 2025

Clean up CMake. #498

Clean up CMake. #498

Conversation

OmniBlade commented Mar 25, 2025

xezon left a comment • edited Loading

Choose a reason for hiding this comment

xezon left a comment

Choose a reason for hiding this comment

DevGeniusCode left a comment • edited Loading

Choose a reason for hiding this comment

xezon left a comment

Choose a reason for hiding this comment

xezon Mar 26, 2025

Choose a reason for hiding this comment

xezon left a comment •

edited

Loading

DevGeniusCode left a comment •

edited

Loading