[Test] Move define of WIN32_LEAN_AND_MEAN and NOMINMAX in CMakeLists.txt

rikyoz · Oct 26, 2023 · 47319c4 · 47319c4
1 parent 1248d22
commit 47319c4
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -215,7 +215,7 @@ target_include_directories( ${LIB_TARGET} PRIVATE "${PROJECT_SOURCE_DIR}/include
 # 7-zip compilation definitions
 target_compile_definitions( ${LIB_TARGET} PRIVATE UNICODE _UNICODE )
 if( WIN32 )
-    target_compile_definitions( ${LIB_TARGET} PRIVATE _WINDOWS )
+    target_compile_definitions( ${LIB_TARGET} PRIVATE _WINDOWS WIN32_LEAN_AND_MEAN NOMINMAX )
     target_link_libraries( ${LIB_TARGET} PUBLIC oleaut32 )
 endif()
 

diff --git a/include/bit7z/bitwindows.hpp b/include/bit7z/bitwindows.hpp
@@ -11,13 +11,6 @@
 #define BITWINDOWS_HPP
 
 #ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include <Windows.h>
 #include <propidl.h>
 #else

diff --git a/src/bitinputarchive.cpp b/src/bitinputarchive.cpp
@@ -10,10 +10,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
 #include "bitinputarchive.hpp"
 
 #include "biterror.hpp"

diff --git a/src/internal/cmultivolumeinstream.cpp b/src/internal/cmultivolumeinstream.cpp
@@ -10,10 +10,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
 #include "internal/cmultivolumeinstream.hpp"
 
 #include "bittypes.hpp"

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -151,6 +151,9 @@ if( WIN32 )
     message( STATUS "Using legacy string encoding for tests: ON" )
     target_sources( ${TESTS_TARGET} PRIVATE res/encodingLegacy.${RES_EXTENSION} )
     target_sources( ${TESTS_TARGET_PUBLIC} PRIVATE res/encodingLegacy.${RES_EXTENSION} )
+
+    target_compile_definitions( ${TESTS_TARGET} PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX )
+    target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX )
 endif()
 
 # Catch2

diff --git a/tests/src/test_bitpropvariant.cpp b/tests/src/test_bitpropvariant.cpp
@@ -9,9 +9,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#ifdef _WIN32
-#define NOMINMAX
-#endif
 
 #include <catch2/catch.hpp>
 

diff --git a/tests/src/test_cbufferinstream.cpp b/tests/src/test_cbufferinstream.cpp
@@ -9,9 +9,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-#ifdef _WIN32
-#define NOMINMAX
-#endif
 
 #include <catch2/catch.hpp>
 

diff --git a/tests/src/utils/filesystem.hpp b/tests/src/utils/filesystem.hpp
@@ -13,10 +13,6 @@
 #include <bit7z/bitfs.hpp>
 #include <bit7z/bittypes.hpp>
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
 #ifdef _WIN32
 #include <array>
 #include <Windows.h>