🛠 Bad macro

soasis · Aug 9, 2024 · 4d5072c · 4d5072c
1 parent 09bf054
commit 4d5072c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,8 +27,7 @@
 #
 # =========================================================================== #
 
-cmake_minimum_required(VERSION 3.21.0)
-cmake_policy(VERSION 3.21)
+cmake_minimum_required(VERSION 3.28.0)
 
 # # Project kickstart
 # Includes a bunch of basic flags and utilities shared across projects
@@ -244,9 +243,9 @@ if (ZTD_CUNEICODE_EXAMPLES OR ZTD_CUNEICODE_SIMDUTF_SHARED)
 			simdutf
 			GIT_REPOSITORY https://github.com/simdutf/simdutf
 			GIT_SHALLOW    ON
-			GIT_TAG        master)
+			GIT_TAG        master
+			EXCLUDE_FROM_ALL)
 		FetchContent_MakeAvailable(simdutf)
-		set_property(DIRECTORY "${simdutf_SOURCE_DIR}" PROPERTY EXCLUDE_FROM_ALL YES)
 	endfunction()
 	simdutf_dependency_jail()
 	add_subdirectory(shared)

diff --git a/include/ztd/cuneicode/detail/api.h b/include/ztd/cuneicode/detail/api.h
@@ -61,7 +61,7 @@
 	#define ZTD_CUNEICODE_API_LINKAGE_I_ ZTD_CUNEICODE_API_LINKAGE
 #else
 	#if ZTD_IS_ON(ZTD_CUNEICODE_DLL)
-		#if ZTD_IS_ON(ZTD_COMPILER_VCXX) || ZTD_IS_ON(ZTD_CUNEICODE_WINDOWS) || ZTD_IS_ON(ZTD_CUNEICODE_CYGWIN)
+		#if ZTD_IS_ON(ZTD_COMPILER_VCXX) || ZTD_IS_ON(ZTD_PLATFORM_WINDOWS) || ZTD_IS_ON(ZTD_PLATFORM_CYGWIN)
 			// MSVC Compiler; or, Windows, or Cygwin platforms
 			#if ZTD_IS_ON(ZTD_CUNEICODE_BUILD)
 				// Building the library

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -36,9 +36,9 @@ FetchContent_Declare(
 	GIT_REPOSITORY https://github.com/catchorg/Catch2.git
 	GIT_SHALLOW ON
 	GIT_TAG devel
+	EXCLUDE_FROM_ALL
 )
 FetchContent_MakeAvailable(catch2)
-set_property(DIRECTORY "${catch2_SOURCE_DIR}" PROPERTY EXCLUDE_FROM_ALL YES)
 
 #add_subdirectory(allocation)
 add_subdirectory(basic_run_time)