Skip to content

Commit 4567dd3

Browse files
committed
Cmake project define macros fixes
1 parent 4df069f commit 4567dd3

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.30)
2-
project(mstd VERSION 1.4.6 LANGUAGES CXX)
2+
project(mstd VERSION 1.4.7 LANGUAGES CXX)
33

44
option(BUILD_MSTD_TESTS "Build mstd tests" OFF)
55
option(BUILD_MSTD_COVERAGE "Enable coverage reporting" OFF)

mstd/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ target_include_directories(${PROJECT_NAME} INTERFACE ${HEADERS_PATHS}
3333
# $<INSTALL_INTERFACE:${INSTALL_HEADERS_PATH}>
3434
)
3535

36-
target_compile_definitions(${PROJECT_NAME} INTERFACE $<IF:$<BOOL:${MSTD_ENABLE_CXX20}>, MSTD_ENABLE_CXX20, >
37-
$<IF:$<BOOL:${MSTD_DISABLE_ASSERT_ON_RELEASE}>, MSTD_DISABLE_ASSERT_ON_RELEASE, >
38-
$<IF:$<BOOL:${MSTD_ENABLE_FOR_EACH_MACROS}>, MSTD_ENABLE_FOR_EACH_MACROS, >
39-
$<IF:$<BOOL:${MSTD_ENABLE_ENUMS_MACROS}>, MSTD_ENABLE_ENUMS_MACROS, >
40-
$<IF:$<BOOL:${MSTD_ENABLE_CLONE_FUNC_MACROS}>, MSTD_ENABLE_CLONE_FUNC_MACROS, >
41-
$<IF:$<BOOL:${MSTD_ENABLE_EXTRA_MACROS}>, MSTD_ENABLE_EXTRA_MACROS, >
36+
target_compile_definitions(${PROJECT_NAME} INTERFACE $<$<BOOL:${MSTD_ENABLE_CXX20}>:MSTD_ENABLE_CXX20>
37+
$<$<BOOL:${MSTD_DISABLE_ASSERT_ON_RELEASE}>:MSTD_DISABLE_ASSERT_ON_RELEASE>
38+
$<$<BOOL:${MSTD_ENABLE_FOR_EACH_MACROS}>:MSTD_ENABLE_FOR_EACH_MACROS>
39+
$<$<BOOL:${MSTD_ENABLE_ENUMS_MACROS}>:MSTD_ENABLE_ENUMS_MACROS>
40+
$<$<BOOL:${MSTD_ENABLE_CLONE_FUNC_MACROS}>:MSTD_ENABLE_CLONE_FUNC_MACROS>
41+
$<$<BOOL:${MSTD_ENABLE_EXTRA_MACROS}>:MSTD_ENABLE_EXTRA_MACROS>
4242
)
4343

4444
# TODO: install

mstd/include/main/mstd/config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#pragma region VERSION
1515
#define MSTD_VERSION_MAJOR 1
1616
#define MSTD_VERSION_MINOR 4
17-
#define MSTD_VERSION_PATCH 6
17+
#define MSTD_VERSION_PATCH 7
1818

1919
#define _MSTD_STRINGIFY_HELPER(x) #x
2020

0 commit comments

Comments
 (0)