Skip to content

Commit ca593d3

Browse files
authored
Issue #737: Print the version of wxWidgets used (#738)
Refining cmake preferences.
1 parent 0cc1aae commit ca593d3

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

CMakePresets.json

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,26 @@
1616
}
1717
},
1818
{
19-
"name": "mac",
20-
"displayName": "Mac - Ninja",
21-
"description": "Mac generator for macOS/Linux",
19+
"name": "mac-release",
20+
"displayName": "Mac - Release",
21+
"description": "Mac Release build with Ninja",
2222
"generator": "Ninja",
23-
"binaryDir": "${sourceDir}/build/${presetName}",
23+
"binaryDir": "${sourceDir}/build/mac-release",
2424
"cacheVariables": {
2525
"CMAKE_BUILD_TYPE": "Release",
2626
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
2727
}
28+
},
29+
{
30+
"name": "mac-debug",
31+
"displayName": "Mac - Debug",
32+
"description": "Mac Debug build with Ninja",
33+
"generator": "Ninja",
34+
"binaryDir": "${sourceDir}/build/mac-debug",
35+
"cacheVariables": {
36+
"CMAKE_BUILD_TYPE": "Debug",
37+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
38+
}
2839
}
2940
],
3041
"buildPresets": [
@@ -40,8 +51,11 @@
4051
},
4152
{
4253
"name": "mac-release",
43-
"configurePreset": "mac",
44-
"configuration": "Release"
54+
"configurePreset": "mac-release"
55+
},
56+
{
57+
"name": "mac-debug",
58+
"configurePreset": "mac-debug"
4559
}
4660
]
47-
}
61+
}

LATEST_RELEASE_NOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ Other changes:
1111
* [#731](../../issues/731) Move tests into the right places
1212
* [#732](../../issues/732) remove wxUI::Custom
1313
* [#735](../../issues/735) Update the CI to have the release or debug in the name
14+
* [#737](../../issues/737) Print the version of wxWidgets used
1415

src/CalChartSplash.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ CalChartSplash::CalChartSplash(wxDocManager* manager, wxFrame* frame, std::strin
130130
wxUI::Bitmap{ BitmapWithBandIcon(GetLogoSize()) }.withFlags(ExpandSizerFlags()),
131131
wxUI::Text{ "CalChart " CC_VERSION }
132132
.withFont(fontTitle),
133+
wxUI::Text{ std::string{ "Built with: " } + wxString{ wxVERSION_STRING }.ToStdString() }
134+
.withFont(fontSubTitle),
133135
wxUI::Line{}
134136
.withSize({ GetLogoLineSize(), -1 }),
135137
wxUI::HSizer{
@@ -158,6 +160,7 @@ void CalChartSplash::About()
158160
// clang-format off
159161
(void)wxMessageBox(
160162
"CalChart " CC_VERSION "\n"
163+
"Built with: " wxVERSION_STRING "\n"
161164
"Authors: Gurk Meeker, Richard Michael Powell\n"
162165
"\n"
163166
"Contributors: Brandon Chinn, Kevin Durand, Noah Gilmore, David Strachan-Olson, Allan Yu\n"

0 commit comments

Comments
 (0)