Skip to content
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

precompiled header and unity build support for Cmake #1937

Merged
merged 9 commits into from
Oct 15, 2022
Prev Previous commit
Next Next commit
build: bump cmake version requirement to 3.16
  • Loading branch information
scarf005 committed Oct 2, 2022
commit 9baf117c21acf2055ee542bfe425594a0605aec4
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Main project build script
cmake_minimum_required(VERSION 3.1.4)
cmake_minimum_required(VERSION 3.16)

PROJECT(CataclysmBN)

Expand All @@ -21,8 +21,8 @@ option(LIBBACKTRACE "Print backtrace with libbacktrace." "OFF")
option(USE_HOME_DIR "Use user's home directory for save files." "ON")
set(LANGUAGES "" CACHE STRING "Compile localization files for specified languages. List of language ids separated by semicolon. Set to 'all' or leave empty to compile all, set to 'none' to compile none.")
option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead." "ON")
option(USE_UNITY_BUILD "Use unity build. New in Cmake 3.16" "OFF")
option(USE_PCH_HEADER "Use precompiled PCH header. New in Cmake 3.16" "OFF")
option(USE_UNITY_BUILD "Use unity build." "OFF")
option(USE_PCH_HEADER "Use precompiled PCH header." "OFF")
option(JSON_FORMAT "Build JSON formatter" "OFF")
option(CATA_CCACHE "Try to find and build with ccache" "ON")
option(CATA_CLANG_TIDY_PLUGIN "Build Cata's custom clang-tidy plugin" "OFF")
Expand Down
2 changes: 1 addition & 1 deletion data/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Cataclysm data files
cmake_minimum_required(VERSION 3.1.4)
cmake_minimum_required(VERSION 3.16)

SET(CATACLYSM_DATA_DIRS
${CMAKE_SOURCE_DIR}/data/font
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Cataclysm BN client
cmake_minimum_required(VERSION 3.1.4)
cmake_minimum_required(VERSION 3.16)

SET(MAIN_CPP ${CMAKE_SOURCE_DIR}/src/main.cpp)
SET(MESSAGES_CPP ${CMAKE_SOURCE_DIR}/src/messages.cpp)
Expand Down