Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 6772a9a

Browse files
walbournwalbourn
committed
Minor cmake code review
1 parent a2f908f commit 6772a9a

File tree

21 files changed

+98
-77
lines changed

21 files changed

+98
-77
lines changed

‎BasicCompute11/CMakeLists.txt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
1515

1616
set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
1717

18-
if (DEFINED VCPKG_TARGET_ARCHITECTURE)
18+
if(DEFINED VCPKG_TARGET_ARCHITECTURE)
1919
set(DIRECTX_ARCH ${VCPKG_TARGET_ARCHITECTURE})
2020
elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
2121
set(DIRECTX_ARCH x86)
@@ -48,10 +48,12 @@ if(MSVC)
4848
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
4949
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5050
endif()
51+
else()
52+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5153
endif()
5254

5355
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
54-
if (${CMAKE_SIZEOF_VOID_P} EQUAL "4")
56+
if(${CMAKE_SIZEOF_VOID_P} EQUAL "4")
5557
set(ARCH_SSE2 $<$<CXX_COMPILER_ID:MSVC>:/arch:SSE2> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
5658
else()
5759
set(ARCH_SSE2 $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
@@ -60,35 +62,34 @@ if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
6062
target_compile_options(${PROJECT_NAME} PRIVATE ${ARCH_SSE2})
6163
endif()
6264

63-
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
65+
if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
6466
target_compile_options(${PROJECT_NAME} PRIVATE
6567
-Wpedantic -Wextra
6668
"-Wno-c++98-compat" "-Wno-c++98-compat-pedantic"
6769
"-Wno-exit-time-destructors" "-Wno-global-constructors" "-Wno-language-extension-token"
6870
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
6971
"-Wno-extra-semi-stmt" "-Wno-float-equal")
7072
elseif(MINGW)
71-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
7273
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
7374
target_link_options(${PROJECT_NAME} PRIVATE -municode)
74-
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
75+
elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
7576
target_compile_options(${PROJECT_NAME} PRIVATE
7677
/sdl /permissive- /Zc:__cplusplus
7778
"/wd4061" "/wd4365" "/wd4514" "/wd4571" "/wd4668" "/wd4710" "/wd4820" "/wd5039" "/wd5045")
7879

79-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
80+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
8081
target_compile_options(${PROJECT_NAME} PRIVATE /ZH:SHA_256)
8182
endif()
8283

83-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
84+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
8485
target_compile_options(${PROJECT_NAME} PRIVATE /Zc:preprocessor /wd5105)
8586
endif()
8687

87-
if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
88+
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
8889
target_link_options(${PROJECT_NAME} PRIVATE /CETCOMPAT)
8990
endif()
9091

91-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
92+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
9293
target_compile_options(${PROJECT_NAME} PRIVATE /wd5262 /wd5264)
9394
endif()
9495
endif()

‎BasicHLSL11/CMakeLists.txt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
1515

1616
set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
1717

18-
if (DEFINED VCPKG_TARGET_ARCHITECTURE)
18+
if(DEFINED VCPKG_TARGET_ARCHITECTURE)
1919
set(DIRECTX_ARCH ${VCPKG_TARGET_ARCHITECTURE})
2020
elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
2121
set(DIRECTX_ARCH x86)
@@ -56,10 +56,12 @@ if(MSVC)
5656
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5757
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5858
endif()
59+
else()
60+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5961
endif()
6062

6163
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
62-
if (${CMAKE_SIZEOF_VOID_P} EQUAL "4")
64+
if(${CMAKE_SIZEOF_VOID_P} EQUAL "4")
6365
set(ARCH_SSE2 $<$<CXX_COMPILER_ID:MSVC>:/arch:SSE2> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
6466
else()
6567
set(ARCH_SSE2 $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
@@ -68,35 +70,34 @@ if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
6870
target_compile_options(${PROJECT_NAME} PRIVATE ${ARCH_SSE2})
6971
endif()
7072

71-
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
73+
if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7274
target_compile_options(${PROJECT_NAME} PRIVATE
7375
-Wpedantic -Wextra
7476
"-Wno-c++98-compat" "-Wno-c++98-compat-pedantic"
7577
"-Wno-exit-time-destructors" "-Wno-global-constructors" "-Wno-language-extension-token"
7678
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
7779
"-Wno-extra-semi-stmt")
7880
elseif(MINGW)
79-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8081
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8182
target_link_options(${PROJECT_NAME} PRIVATE -municode)
82-
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
83+
elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
8384
target_compile_options(${PROJECT_NAME} PRIVATE
8485
/sdl /permissive- /Zc:__cplusplus
8586
"/wd4061" "/wd4365" "/wd4514" "/wd4571" "/wd4668" "/wd4710" "/wd4820" "/wd5039" "/wd5045")
8687

87-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
88+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
8889
target_compile_options(${PROJECT_NAME} PRIVATE /ZH:SHA_256)
8990
endif()
9091

91-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
92+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
9293
target_compile_options(${PROJECT_NAME} PRIVATE /Zc:preprocessor /wd5105)
9394
endif()
9495

95-
if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
96+
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
9697
target_link_options(${PROJECT_NAME} PRIVATE /CETCOMPAT)
9798
endif()
9899

99-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
100+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
100101
target_compile_options(${PROJECT_NAME} PRIVATE /wd5262 /wd5264)
101102
endif()
102103
endif()

‎BasicHLSLFX11/CMakeLists.txt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
1515

1616
set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
1717

18-
if (DEFINED VCPKG_TARGET_ARCHITECTURE)
18+
if(DEFINED VCPKG_TARGET_ARCHITECTURE)
1919
set(DIRECTX_ARCH ${VCPKG_TARGET_ARCHITECTURE})
2020
elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
2121
set(DIRECTX_ARCH x86)
@@ -59,10 +59,12 @@ if(MSVC)
5959
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
6060
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
6161
endif()
62+
else()
63+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
6264
endif()
6365

6466
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
65-
if (${CMAKE_SIZEOF_VOID_P} EQUAL "4")
67+
if(${CMAKE_SIZEOF_VOID_P} EQUAL "4")
6668
set(ARCH_SSE2 $<$<CXX_COMPILER_ID:MSVC>:/arch:SSE2> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
6769
else()
6870
set(ARCH_SSE2 $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
@@ -71,35 +73,34 @@ if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
7173
target_compile_options(${PROJECT_NAME} PRIVATE ${ARCH_SSE2})
7274
endif()
7375

74-
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
76+
if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7577
target_compile_options(${PROJECT_NAME} PRIVATE
7678
-Wpedantic -Wextra
7779
"-Wno-c++98-compat" "-Wno-c++98-compat-pedantic"
7880
"-Wno-exit-time-destructors" "-Wno-global-constructors" "-Wno-language-extension-token"
7981
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
8082
"-Wno-extra-semi-stmt" "-Wno-double-promotion")
8183
elseif(MINGW)
82-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8384
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8485
target_link_options(${PROJECT_NAME} PRIVATE -municode)
85-
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
86+
elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
8687
target_compile_options(${PROJECT_NAME} PRIVATE
8788
/sdl /permissive- /Zc:__cplusplus
8889
"/wd4061" "/wd4365" "/wd4514" "/wd4571" "/wd4668" "/wd4710" "/wd4820" "/wd5039" "/wd5045")
8990

90-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
91+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
9192
target_compile_options(${PROJECT_NAME} PRIVATE /ZH:SHA_256)
9293
endif()
9394

94-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
95+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
9596
target_compile_options(${PROJECT_NAME} PRIVATE /Zc:preprocessor /wd5105)
9697
endif()
9798

98-
if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
99+
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
99100
target_link_options(${PROJECT_NAME} PRIVATE /CETCOMPAT)
100101
endif()
101102

102-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
103+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
103104
target_compile_options(${PROJECT_NAME} PRIVATE /wd5262 /wd5264)
104105
endif()
105106
endif()

‎ComputeShaderSort11/CMakeLists.txt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/CMake")
1515

1616
set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
1717

18-
if (DEFINED VCPKG_TARGET_ARCHITECTURE)
18+
if(DEFINED VCPKG_TARGET_ARCHITECTURE)
1919
set(DIRECTX_ARCH ${VCPKG_TARGET_ARCHITECTURE})
2020
elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
2121
set(DIRECTX_ARCH x86)
@@ -48,10 +48,12 @@ if(MSVC)
4848
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
4949
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5050
endif()
51+
else()
52+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5153
endif()
5254

5355
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
54-
if (${CMAKE_SIZEOF_VOID_P} EQUAL "4")
56+
if(${CMAKE_SIZEOF_VOID_P} EQUAL "4")
5557
set(ARCH_SSE2 $<$<CXX_COMPILER_ID:MSVC>:/arch:SSE2> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
5658
else()
5759
set(ARCH_SSE2 $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-msse2>)
@@ -60,35 +62,34 @@ if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
6062
target_compile_options(${PROJECT_NAME} PRIVATE ${ARCH_SSE2})
6163
endif()
6264

63-
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
65+
if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
6466
target_compile_options(${PROJECT_NAME} PRIVATE
6567
-Wpedantic -Wextra
6668
"-Wno-c++98-compat" "-Wno-c++98-compat-pedantic"
6769
"-Wno-exit-time-destructors" "-Wno-global-constructors" "-Wno-language-extension-token"
6870
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
6971
"-Wno-extra-semi-stmt" "-Wno-float-equal")
7072
elseif(MINGW)
71-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
7273
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
7374
target_link_options(${PROJECT_NAME} PRIVATE -municode)
74-
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
75+
elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
7576
target_compile_options(${PROJECT_NAME} PRIVATE
7677
/sdl /permissive- /Zc:__cplusplus
7778
"/wd4061" "/wd4365" "/wd4514" "/wd4571" "/wd4668" "/wd4710" "/wd4820" "/wd5039" "/wd5045")
7879

79-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
80+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
8081
target_compile_options(${PROJECT_NAME} PRIVATE /ZH:SHA_256)
8182
endif()
8283

83-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
84+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
8485
target_compile_options(${PROJECT_NAME} PRIVATE /Zc:preprocessor /wd5105)
8586
endif()
8687

87-
if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
88+
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
8889
target_link_options(${PROJECT_NAME} PRIVATE /CETCOMPAT)
8990
endif()
9091

91-
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
92+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
9293
target_compile_options(${PROJECT_NAME} PRIVATE /wd5262 /wd5264)
9394
endif()
9495
endif()

‎Direct3D11Tutorials/Tutorial01/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ if(MSVC)
5656
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5757
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5858
endif()
59+
else()
60+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5961
endif()
6062

6163
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
@@ -76,7 +78,6 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7678
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
7779
"-Wno-extra-semi-stmt")
7880
elseif(MINGW)
79-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8081
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8182
target_link_options(${PROJECT_NAME} PRIVATE -municode)
8283
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )

‎Direct3D11Tutorials/Tutorial02/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ if(MSVC)
5656
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5757
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5858
endif()
59+
else()
60+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5961
endif()
6062

6163
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
@@ -76,7 +78,6 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7678
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
7779
"-Wno-extra-semi-stmt")
7880
elseif(MINGW)
79-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8081
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8182
target_link_options(${PROJECT_NAME} PRIVATE -municode)
8283
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )

‎Direct3D11Tutorials/Tutorial03/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ if(MSVC)
5656
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5757
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5858
endif()
59+
else()
60+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5961
endif()
6062

6163
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
@@ -76,7 +78,6 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7678
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
7779
"-Wno-extra-semi-stmt")
7880
elseif(MINGW)
79-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8081
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8182
target_link_options(${PROJECT_NAME} PRIVATE -municode)
8283
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )

‎Direct3D11Tutorials/Tutorial04/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ if(MSVC)
5656
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5757
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5858
endif()
59+
else()
60+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5961
endif()
6062

6163
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
@@ -76,7 +78,6 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7678
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
7779
"-Wno-extra-semi-stmt")
7880
elseif(MINGW)
79-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8081
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8182
target_link_options(${PROJECT_NAME} PRIVATE -municode)
8283
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )

‎Direct3D11Tutorials/Tutorial05/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ if(MSVC)
5656
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5757
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5858
endif()
59+
else()
60+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5961
endif()
6062

6163
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
@@ -76,7 +78,6 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7678
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
7779
"-Wno-extra-semi-stmt")
7880
elseif(MINGW)
79-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8081
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8182
target_link_options(${PROJECT_NAME} PRIVATE -municode)
8283
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )

‎Direct3D11Tutorials/Tutorial06/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ if(MSVC)
5656
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5757
target_link_options(${PROJECT_NAME} PRIVATE "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
5858
endif()
59+
else
60+
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
5961
endif()
6062

6163
if(NOT ${DIRECTX_ARCH} MATCHES "^arm")
@@ -76,7 +78,6 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
7678
"-Wno-missing-prototypes" "-Wno-missing-variable-declarations" "-Wno-reserved-id-macro"
7779
"-Wno-extra-semi-stmt")
7880
elseif(MINGW)
79-
target_compile_definitions(${PROJECT_NAME} PRIVATE $<IF:$<CONFIG:DEBUG>,_DEBUG,NDEBUG>)
8081
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-ignored-attributes)
8182
target_link_options(${PROJECT_NAME} PRIVATE -municode)
8283
elseif ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )

0 commit comments

Comments
 (0)