From: AceVest <zhaoyanbai@126.com>
Date: Fri, 27 Jul 2018 10:57:22 +0000 (+0800)
Subject: ...
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=24dfc71fad9e2310086bdfc640e75b5080c2e12d;p=acecode.git

...
---

diff --git a/rtos/CMakeLists.txt b/rtos/CMakeLists.txt
index 6ea8a8b..bdb739b 100644
--- a/rtos/CMakeLists.txt
+++ b/rtos/CMakeLists.txt
@@ -7,7 +7,6 @@ SET(RTOS_VERSION_MINOR 1)
 PROJECT(rtos)
 ENABLE_LANGUAGE(ASM)
 
-
 CONFIGURE_FILE(
 	"${PROJECT_SOURCE_DIR}/rtos_config.h.in"
 	"${PROJECT_BINARY_DIR}/rtos_config.h"
@@ -24,4 +23,4 @@ ADD_EXECUTABLE(rtos rtos.c)
 
 
 # TARGET_LINK_LIBRARIES 参数里 debug optimized general 是关键词，不能用
-TARGET_LINK_LIBRARIES(rtos utils)
+TARGET_LINK_LIBRARIES(rtos components)
diff --git a/rtos/components/CMakeLists.txt b/rtos/components/CMakeLists.txt
index 674c9a1..9735536 100644
--- a/rtos/components/CMakeLists.txt
+++ b/rtos/components/CMakeLists.txt
@@ -1 +1,2 @@
 ADD_SUBDIRECTORY(utils)
+ADD_LIBRARY(components $<TARGET_OBJECTS:utils_object>)
diff --git a/rtos/components/utils/CMakeLists.txt b/rtos/components/utils/CMakeLists.txt
index 3328262..0728f1b 100644
--- a/rtos/components/utils/CMakeLists.txt
+++ b/rtos/components/utils/CMakeLists.txt
@@ -1,5 +1,6 @@
-ADD_LIBRARY(utils STATIC
+SET(utils_sources
 	debug.c
 	debug.S
 )
-
+ADD_LIBRARY(utils_object OBJECT ${utils_sources})
+ADD_LIBRARY(utils        STATIC ${utils_sources})