fix: reverted changes to reallow unit tests in a static build

brainboxdotcc · Jul 9, 2024 · 3bbc5b2 · 3bbc5b2
1 parent 3820ef5
commit 3bbc5b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,13 +29,6 @@ option(DPP_USE_EXTERNAL_JSON "Use an external installation of nlohmann::json" OF
 option(DPP_USE_PCH "Use precompiled headers to speed up compilation" OFF)
 option(AVX_TYPE "Force AVX type for speeding up audio mixing" OFF)
 
-include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/colour.cmake")
-
-if (DPP_BUILD_TEST AND NOT BUILD_SHARED_LIBS)
-	set(DPP_BUILD_TEST OFF)
-	message("-- ${Yellow}Note - Unit Tests have been forcibly disabled since you are building statically.${ColourReset}")
-endif()
-
 include(CheckCXXSymbolExists)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 add_compile_definitions(DPP_BUILD)

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -359,7 +359,11 @@ if (DPP_BUILD_TEST)
 			if (MSVC)
 				target_compile_options(${testname} PRIVATE /utf-8)
 			endif()
-			target_link_libraries(${testname} PUBLIC ${modname})
+			set (static_if_needed "")
+			if(NOT BUILD_SHARED_LIBS)
+				set (static_if_needed "-static")
+			endif()
+			target_link_libraries(${testname} PUBLIC ${modname} ${static_if_needed})
 		endif()
 	endforeach()
 	add_test(