diff --git a/CMakeLists.txt b/CMakeLists.txt
index a68b652ca..c57d46402 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,6 +228,9 @@ elseif((FREERTOS_PORT STREQUAL "A_CUSTOM_PORT") AND (NOT TARGET freertos_kernel_
     "       freertos_kernel_include)")
 endif()
 
+
+add_library(freertos_kernel STATIC)
+
 ########################################################################
 # Overall Compile Options
 # Note the compile option strategy is to error on everything and then
@@ -248,7 +251,7 @@ endif()
 #   MSVC        | MSVC # Note only for MinGW?
 #   Renesas     | ?TBD?
 
-add_compile_options(
+target_compile_options(freertos_kernel PRIVATE
     ### Gnu/Clang C Options
     $<$<COMPILE_LANG_AND_ID:C,GNU>:-fdiagnostics-color=always>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-fcolor-diagnostics>
@@ -267,7 +270,7 @@ add_compile_options(
 add_subdirectory(include)
 add_subdirectory(portable)
 
-add_library(freertos_kernel STATIC
+target_sources(freertos_kernel PRIVATE
     croutine.c
     event_groups.c
     list.c
@@ -280,6 +283,7 @@ add_library(freertos_kernel STATIC
     $<IF:$<BOOL:$<FILTER:${FREERTOS_HEAP},EXCLUDE,^[1-5]$>>,${FREERTOS_HEAP},portable/MemMang/heap_${FREERTOS_HEAP}.c>
 )
 
+
 target_link_libraries(freertos_kernel
     PUBLIC
         freertos_kernel_port