From da7ed64d55218d52e821a558852a75fefff86a72 Mon Sep 17 00:00:00 2001 From: Piotr Macha Date: Tue, 18 Jun 2024 09:44:16 +0200 Subject: [PATCH] ci: set proper build types --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 10 +++------- CMakePresets.json | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78253c5..45b7ec5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ on: enable-tests: required: false type: boolean - default: false + default: true notify-tests: required: false type: boolean diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bccbd2..b1f3aef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,18 +9,14 @@ project(zBassMusic VERSION "${PROJECT_VERSION_CMAKE}" LANGUAGES CXX) option(BUILD_VDF "Build .VDF file with plugin" ON) option(BUILD_TESTS "Build tests" ON) -#set(UNION_API_DIR "${CMAKE_SOURCE_DIR}/dependencies/union-api") -#set(GOTHIC_API_DIR "${CMAKE_SOURCE_DIR}/dependencies/gothic-api") set(BASS_DIR "${CMAKE_SOURCE_DIR}/dependencies/bass") set(VDF_DIR "${CMAKE_SOURCE_DIR}/vdf") set(GOTHIC_USERAPI_DIR "${CMAKE_SOURCE_DIR}/gothic-userapi") set(CMAKE_CXX_STANDARD 23) -set(CMAKE_CXX_FLAGS "${CMAE_CXX_FLAGS} /Zc:__cplusplus") -if (${CMAKE_BUILD_RELEASE_PDB}) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF") -endif () +set(CMAKE_CXX_FLAGS_DEBUG "${CMAE_CXX_FLAGS_DEBUG} /Zc:__cplusplus") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAE_CXX_FLAGS_RELEASE} /Zc:__cplusplus") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAE_CXX_FLAGS_RELWITHDEBINFO} /Zc:__cplusplus") include(FetchContent) set(BUILD_UNION_API_STATIC OFF CACHE INTERNAL "Disable static build of UnionAPI") diff --git a/CMakePresets.json b/CMakePresets.json index 23b7a16..3fff09f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -39,11 +39,11 @@ } }, { - "name": "x86-release-pdb", - "displayName": "x86 Release (Debug Symbols)", + "name": "x86-relwithdebinfo", + "displayName": "x86 RelWithDebInfo", "inherits": "x86-release", "cacheVariables": { - "CMAKE_BUILD_RELEASE_PDB": "yes" + "CMAKE_BUILD_TYPE": "RelWithDebInfo" } } ]