Windcorp/Progressia
3
0
Fork 0
mirror of https://gitea.windcorp.ru/Wind-Corporation/Progressia.git synced 2025-04-21 23:10:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

TMP / removed -wall for clang and BUILD_ID is now in cmake cache

Browse Source
This commit is contained in:
OLEGSHA 2022-11-19 00:15:55 +03:00
parent f8e23f5713
commit c518a69b75
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -12,6 +12,7 @@ include(embed/embed)
include(glslc) include(glslc)
# Options # Options
option(BUILD_ID "Build ID. Set to \"dev\" unless building a release that you intend to publish" "dev")
option(VULKAN_ERROR_CHECKING "Enable Vulkan validation layers to detect Vulkan API usage errors at runtime") option(VULKAN_ERROR_CHECKING "Enable Vulkan validation layers to detect Vulkan API usage errors at runtime")
# Source files # Source files
@ -61,7 +62,7 @@ set_property(TARGET progressia PROPERTY CXX_STANDARD 17)
set_property(TARGET progressia PROPERTY CXX_STANDARD_REQUIRED ON) set_property(TARGET progressia PROPERTY CXX_STANDARD_REQUIRED ON)
# Do Windows-specific tweaks for release builds # Do Windows-specific tweaks for release builds
if (WIN32 AND DEFINED ENV{PROGRESSIA_BUILD_ID}) if (WIN32 AND DEFINED BUILD_ID)
set_target_properties(progressia PROPERTIES WIN32_EXECUTABLE true) set_target_properties(progressia PROPERTIES WIN32_EXECUTABLE true)
if (gcc_like_compiler) if (gcc_like_compiler)
@ -73,16 +74,11 @@ if (WIN32 AND DEFINED ENV{PROGRESSIA_BUILD_ID})
endif() endif()
# Extra options for gcc -- we're using this for extra static analisys for now # Extra options for gcc -- we're using this for extra static analisys for now
if (gcc_like_compiler) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(progressia PRIVATE -Wall -Wextra -Wpedantic -Werror) target_compile_options(progressia PRIVATE -Wall -Wextra -Wpedantic -Werror)
endif() endif()
# Pass configuration options # Pass configuration options
if (DEFINED ENV{PROGRESSIA_BUILD_ID})
set(BUILD_ID ENV{PROGRESSIA_BUILD_ID})
else()
set(BUILD_ID "dev")
endif()
file(MAKE_DIRECTORY "${generated}/config") file(MAKE_DIRECTORY "${generated}/config")
configure_file(${PROJECT_SOURCE_DIR}/main/config.h.in configure_file(${PROJECT_SOURCE_DIR}/main/config.h.in
${generated}/config/config.h) ${generated}/config/config.h)