diff --git a/CMakeLists.txt b/CMakeLists.txt index 411d3f6..01bcf4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ set(CMAKE_INSTALL_PREFIX "./") include(zcmake/zcmake.cmake) project(app) +# 设置ccache加速C++编译速度 set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) @@ -38,7 +39,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") message("PROJECT_NAME: ${PROJECT_NAME}") -set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/) +# 添加相应的依赖代码 include(dep/iflytopcpp/module.cmake) include(dep/asio1.12.2/module.cmake) include(dep/websocketpp/module.cmake) @@ -46,29 +47,11 @@ include(dep/zservice_container/module.cmake) include(dep/zwebservice/module.cmake) include(dep/zlinuxcomponents/module.cmake) -function(zadd_executable_simple) - set(oneValueArgs NAME TARGET) - set(multiValueArgs SRC) - cmake_parse_arguments(VAR "${options}" "${oneValueArgs}" "${multiValueArgs}" - ${ARGN}) - zadd_executable( - TARGET - ${VAR_TARGET} - INSTALL - ./app - LINK_LIBRARIES - asound - pthread - INCLUDE_DIRECTORIES - ${DEP_INCLUDE} - ./src - DEFINES - ${DEP_DEFINE} - SRC - ${DEP_SRC} - ${VAR_SRC}) -endfunction(zadd_executable_simple) +# 设置当前工程依赖的头文件路径和链接的库文件 +set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/) +set(DEP_LINK_LIBRARIES ${DEP_LINK_LIBRARIES} asound pthread) +# 添加编译的目标文件 zadd_executable_simple( TARGET app.out diff --git a/zcmake b/zcmake index dfefd17..a9f2e9f 160000 --- a/zcmake +++ b/zcmake @@ -1 +1 @@ -Subproject commit dfefd1773b943240a8c8aceaa67df5b80b8b9d0d +Subproject commit a9f2e9f40f8a9fef61f3d5f72efa03dfe5462100