fix: 修复了CMake构建问题

Author: hevake

3rd-party/nlohmann/Makefile

@@ -24,4 +24,4 @@ HEAD_FILES = \
 	json.hpp \
 	json_fwd.hpp \
 
-include $(TOP_DIR)/tools/lib_header_only_common.mk
+include $(TOP_DIR)/mk/lib_header_only_common.mk

CMakeLists.txt

@@ -160,7 +160,7 @@ endif()
 
 if(TBOX_ENABLE_TRACE)
     message(STATUS "trace module enabled")
-    add_subdirectory(modules/trace/lib)
+    list(APPEND TBOX_COMPONENTS trace)
 endif()
 
 if(TBOX_ENABLE_MAIN)

Makefile

@@ -23,7 +23,7 @@ export TOP_DIR:=$(PWD)
 include build_env.mk
 include version.mk
 
-.PHONY: all 3rd-party modules examples test clean distclean print
+.PHONY: all 3rd-party modules tools examples test clean distclean print
 
 CCFLAGS := -Wall
 
@@ -59,7 +59,7 @@ CXXFLAGS := $(CCFLAGS) $(CXXFLAGS)
 CFLAGS := $(CCFLAGS) $(CFLAGS)
 APPS_DIR := $(PWD)
 
-all: 3rd-party modules test examples
+all: 3rd-party modules test tools examples
 
 print:
 	@echo "CXXFLAGS = $(CXXFLAGS)"
@@ -71,7 +71,7 @@ modules 3rd-party:
 test: modules
 	$(MAKE) -C modules test
 
-examples: modules
+tools examples: modules
 	$(MAKE) -C $@
 
 clean:

examples/alarm/cron_alarm/Makefile

@@ -30,4 +30,4 @@ LDFLAGS += \
 	-ltbox_base \
 	-ldl
 
-include ${TOP_DIR}/tools/exe_common.mk
+include $(TOP_DIR)/mk/exe_common.mk

examples/alarm/oneshot_alarm/Makefile

@@ -30,4 +30,4 @@ LDFLAGS += \
 	-ltbox_base \
 	-ldl
 
-include ${TOP_DIR}/tools/exe_common.mk
+include $(TOP_DIR)/mk/exe_common.mk

examples/alarm/weekly_alarm/Makefile

@@ -30,4 +30,4 @@ LDFLAGS += \
 	-ltbox_base \
 	-ldl
 
-include ${TOP_DIR}/tools/exe_common.mk
+include $(TOP_DIR)/mk/exe_common.mk

examples/base/assert/Makefile

@@ -26,4 +26,4 @@ CPP_SRC_FILES := main.cpp
 CXXFLAGS := -DMODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
 LDFLAGS += -ltbox_base -ldl
 
-include ${TOP_DIR}/tools/exe_common.mk
+include $(TOP_DIR)/mk/exe_common.mk

examples/base/object_pool/Makefile

@@ -26,4 +26,4 @@ CPP_SRC_FILES := main.cpp
 CXXFLAGS := -DMODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
 LDFLAGS += -ltbox_base -ldl
 
-include ${TOP_DIR}/tools/exe_common.mk
+include $(TOP_DIR)/mk/exe_common.mk

examples/base/print_log/Makefile

@@ -29,4 +29,4 @@ CFLAGS += -DMODULE_ID='"demo"'
 
 LDFLAGS += -ltbox_base -ldl
 
-include ${TOP_DIR}/tools/exe_common.mk
+include $(TOP_DIR)/mk/exe_common.mk

examples/dbus/00-loop/Makefile

@@ -32,4 +32,4 @@ LDFLAGS += \
 	-ltbox_base \
 	-ldl
 
-include ${TOP_DIR}/tools/exe_common.mk
+include $(TOP_DIR)/mk/exe_common.mk