From 120022aa349f5e4cac28da74d568373c49245884 Mon Sep 17 00:00:00 2001
From: vnugent <public@vaughnnugent.com>
Date: Sun, 4 Feb 2024 21:09:52 -0500
Subject: merge latest patches and tests

---
 CMakeLists.txt | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3872f13..2504480 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,14 +44,10 @@ if(MSVC)
 		
 		$<$<CONFIG:Debug>:/FC>				#show full path in diagnostics
 		$<$<CONFIG:Debug>:/showIncludes>	#show a list of all included header files during build	
-	)
-
-	#only target our project
-	target_compile_options(
-		${CMAKE_PROJECT_NAME}
-		PRIVATE
 
+		
 		$<$<CONFIG:Debug>:/wd4820>	#disable warnings for struct padding and spectre mitigation wuen WX is enabled
+		$<$<CONFIG:Debug>:/wd5045>	#disable warnings for spectre mitigation insertion
 
 		#for debug configs
 		$<$<CONFIG:Debug>:/options:strict>
@@ -78,12 +74,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC)
 		$<$<CONFIG:Debug>:-Og>
 		$<$<CONFIG:Debug>:-Wall>
 		$<$<CONFIG:Debug>:-Werror>
-	)
-
-	#only target our project if building other 3rd party libs in current build
-    target_compile_options(
-		${CMAKE_PROJECT_NAME}
-		PRIVATE
 		$<$<CONFIG:Debug>:-Wall>
 		$<$<CONFIG:Debug>:-pedantic>
 	)
@@ -132,6 +122,7 @@ add_executable(nctest tests/test.c)
 target_link_libraries(nctest ${CMAKE_PROJECT_NAME})
 #link mbedtls crypto sahred library
 target_link_libraries(nctest ${MBEDCRYPTO_LIB} ${MBEDTLS_LIB})
+target_include_directories(nctest PRIVATE "src")
 
 endif()
 
-- 
cgit