Skip to content

Commit c1416f1

Browse files
OmniBladeOmniBlade
committed
Implements a CMakePresets.json file.
Now uses preset config for CI builds. Moves compiler flags out of CMakeLists.txt into presets.
1 parent 1e3a66a commit c1416f1

File tree

4 files changed

+118
-63
lines changed

4 files changed

+118
-63
lines changed

‎.github/workflows/linux.yml

+2-17
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,18 @@ jobs:
3030
with:
3131
submodules: "recursive"
3232

33-
- name: Set variables
34-
id: vars
35-
run: |
36-
if [ "${{ matrix.platform }}" = "clang" ]
37-
then
38-
echo "::set-output name=cc::clang"
39-
echo "::set-output name=cxx::clang++"
40-
else
41-
echo "::set-output name=cc::gcc"
42-
echo "::set-output name=cxx::g++"
43-
fi
44-
4533
- name: Install dependencies
4634
run: |
4735
sudo apt-get install -y libgtk-3-dev ninja-build clang-format-10 libwxgtk3.0-gtk3-dev
4836
4937
- name: Build Thyme
50-
env:
51-
CC: ${{ steps.vars.outputs.cc }}
52-
CXX: ${{ steps.vars.outputs.cxx }}
5338
run: |
54-
cmake -DBUILD_TOOLS=ON -DSTANDALONE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON -DUSE_CRASHPAD=ON -B build -G Ninja
39+
cmake --preset ${{ matrix.platform }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON -DUSE_CRASHPAD=ON -B build
5540
cmake --build build --target format
5641
git diff --exit-code
5742
cmake --build build
5843
5944
- name: Test Thyme
6045
run: |
6146
cd build
62-
ctest . --output-on-failure
47+
ctest . --output-on-failure

‎.github/workflows/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Build Thyme
5757
run: |
58-
cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON -DBUILD_TOOLS=ON -DSTANDALONE=ON -DUSE_CRASHPAD=ON -DwxWidgets_wxrc_EXECUTABLE=D:\${{ steps.vars.outputs.wx_ver }}\utils\wxrc\${{ steps.vars.outputs.wxrc_path }}\wxrc.exe -DwxWidgets_ROOT_DIR=D:\${{ steps.vars.outputs.wx_ver }} -DwxWidgets_LIB_DIR=D:\${{ steps.vars.outputs.wx_ver }}\libs\vc_x64_lib -DwxWidgets_CONFIGURATION=mswu -B build
58+
cmake --preset cl-2019 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON -DUSE_CRASHPAD=ON -DwxWidgets_wxrc_EXECUTABLE=D:\${{ steps.vars.outputs.wx_ver }}\utils\wxrc\${{ steps.vars.outputs.wxrc_path }}\wxrc.exe -DwxWidgets_ROOT_DIR=D:\${{ steps.vars.outputs.wx_ver }} -DwxWidgets_LIB_DIR=D:\${{ steps.vars.outputs.wx_ver }}\libs\vc_x64_lib -DwxWidgets_CONFIGURATION=mswu -B build
5959
cmake --build build --config RelWithDebInfo
6060
6161
- name: Test Thyme

‎CMakeLists.txt

+1-45
Original file line numberDiff line numberDiff line change
@@ -17,43 +17,6 @@ endif()
1717

1818
project(thyme VERSION 1.04.0 LANGUAGES C CXX)
1919

20-
if(MSVC)
21-
string(REPLACE "INCREMENTAL" "INCREMENTAL:NO" replacementFlags ${CMAKE_EXE_LINKER_FLAGS_DEBUG})
22-
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/DYNAMICBASE:NO /NXCOMPAT:NO /INCREMENTAL:NO ${replacementFlags}")
23-
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/DYNAMICBASE:NO /NXCOMPAT:NO /INCREMENTAL:NO ${replacementFlags}")
24-
25-
string(REPLACE "INCREMENTAL" "INCREMENTAL:NO" replacementFlags ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO})
26-
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags}")
27-
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags}")
28-
29-
# Disable Run Time Checking.
30-
foreach(flag_var
31-
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
32-
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
33-
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
34-
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
35-
#message("Processing flags ${flag_var}")
36-
string(REGEX REPLACE "/RTC[^ ]*" "" ${flag_var} "${${flag_var}}")
37-
endforeach(flag_var)
38-
39-
# Use x87 floating point instructions
40-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:IA32")
41-
42-
# Set warning level 3
43-
# disable C4244: conversion from 'double' to 'float', possible loss of data
44-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /wd4244")
45-
46-
if (MSVC_VERSION LESS 1920)
47-
# MSVC lower than 19
48-
# disable C4800: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
49-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800")
50-
else()
51-
# newer MSVC
52-
# make C4800 error: Implicit conversion from 'type' to bool. Possible information loss
53-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4800")
54-
endif()
55-
endif()
56-
5720
set(CMAKE_CXX_STANDARD 17)
5821

5922
# We don't support in tree builds, so help people make the right choice.
@@ -122,15 +85,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${thyme_SOURCE_DIR}/cmake/modules)
12285
find_package(ClangFormat)
12386
include(ClangFormat)
12487

125-
include(CheckCXXCompilerFlag)
12688
include(GNUInstallDirs)
12789

128-
check_cxx_compiler_flag(-Wno-invalid-offsetof HAVE_NO_INVALID_OFFSETOF)
129-
130-
if(HAVE_NO_INVALID_OFFSETOF)
131-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof")
132-
endif()
133-
13490
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
13591
# Prevent lib prefix when built with MinGW to target windows and move to own dir.
13692
if(MINGW)
@@ -289,4 +245,4 @@ endif()
289245
if(BUILD_TESTS)
290246
enable_testing()
291247
add_subdirectory(tests)
292-
endif()
248+
endif()

‎CMakePresets.json

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"version": 1,
3+
"configurePresets": [
4+
{
5+
"name": "default",
6+
"displayName": "Default Config",
7+
"generator": "Ninja",
8+
"hidden": true,
9+
"binaryDir": "${sourceDir}/build",
10+
"cacheVariables": {
11+
"STANDALONE": "ON",
12+
"BUILD_TOOLS": "ON"
13+
}
14+
},
15+
{
16+
"name": "default-win",
17+
"inherits": "default",
18+
"displayName": "MSVC defaults",
19+
"hidden": true,
20+
"cacheVariables": {
21+
"CMAKE_EXE_LINKER_FLAGS_DEBUG": "/debug /INCREMENTAL:NO /DYNAMICBASE:NO /NXCOMPAT:NO",
22+
"CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO": "/debug /INCREMENTAL:NO",
23+
"CMAKE_MODULE_LINKER_FLAGS_DEBUG": "/debug /INCREMENTAL:NO /DYNAMICBASE:NO /NXCOMPAT:NO",
24+
"CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO": "/debug /INCREMENTAL:NO",
25+
"CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/debug /INCREMENTAL:NO /DYNAMICBASE:NO /NXCOMPAT:NO",
26+
"CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO": "/debug /INCREMENTAL:NO",
27+
"CMAKE_C_FLAGS_DEBUG": "/MDd /Zi /Ob0 /Od",
28+
"CMAKE_CXX_FLAGS_DEBUG": "/MDd /Zi /Ob0 /Od"
29+
}
30+
},
31+
{
32+
"name": "cl-2017",
33+
"inherits": "default-win",
34+
"displayName": "MSVC CL 2017 build",
35+
"cacheVariables": {
36+
"CMAKE_CXX_FLAGS": "/DWIN32 /D_WINDOWS /Zc:strictStrings /W3 /wd4244 /wd4800 /arch:IA32 /GR /EHsc"
37+
}
38+
},
39+
{
40+
"name": "cl-2019",
41+
"inherits": "default-win",
42+
"displayName": "MSVC CL 2019 build",
43+
"cacheVariables": {
44+
"CMAKE_CXX_FLAGS": "/DWIN32 /D_WINDOWS /Zc:strictStrings /W3 /wd4244 /we4800 /arch:IA32 /GR /EHsc"
45+
}
46+
},
47+
{
48+
"name": "msvc2017-i686",
49+
"inherits": "cl-2017",
50+
"displayName": "MSVC 2017 32bit build",
51+
"generator": "Visual Studio 15 2017",
52+
"cacheVariables": {
53+
"BUILD_DLL": "ON"
54+
}
55+
},
56+
{
57+
"name": "msvc2017-x86-64",
58+
"inherits": "cl-2017",
59+
"displayName": "MSVC 2017 64bit build",
60+
"generator": "Visual Studio 15 2017 Win64",
61+
"cacheVariables": {
62+
"BUILD_DLL": "OFF"
63+
}
64+
},
65+
{
66+
"name": "msvc2019-i686",
67+
"inherits": "cl-2019",
68+
"displayName": "MSVC 2019 32bit build",
69+
"generator": "Visual Studio 16 2019",
70+
"architecture": "Win32",
71+
"cacheVariables": {
72+
"BUILD_DLL": "ON"
73+
}
74+
},
75+
{
76+
"name": "msvc2019-x86-64",
77+
"inherits": "cl-2019",
78+
"displayName": "MSVC 2019 64bit build",
79+
"generator": "Visual Studio 16 2019",
80+
"architecture": "x64",
81+
"cacheVariables": {
82+
"BUILD_DLL": "OFF"
83+
}
84+
},
85+
{
86+
"name": "default-unix",
87+
"inherits": "default",
88+
"hidden": true,
89+
"displayName": "UNIX defaults",
90+
"cacheVariables": {
91+
"BUILD_DLL": "OFF",
92+
"CMAKE_CXX_FLAGS": "-Wno-invalid-offsetof"
93+
}
94+
},
95+
{
96+
"name": "gcc",
97+
"inherits": "default-unix",
98+
"displayName": "GCC build",
99+
"environment": {
100+
"CC": "gcc",
101+
"CXX": "g++"
102+
}
103+
},
104+
{
105+
"name": "clang",
106+
"inherits": "default-unix",
107+
"displayName": "Clang build",
108+
"environment": {
109+
"CC": "clang",
110+
"CXX": "clang++"
111+
}
112+
}
113+
]
114+
}

0 commit comments

Comments
 (0)