diff --git a/CMakelists.txt b/CMakelists.txt index a3a7db8..447149c 100644 --- a/CMakelists.txt +++ b/CMakelists.txt @@ -38,6 +38,10 @@ include_directories(src) add_executable(demo ${DIR_SRC}) # 1. 添加链接库 +# 1.A 如果是动态库,修改了安装路径之后,exe就找不到了怎么破? +# link_directories(${PROJECT_SOURCE_DIR}/lib) +# target_link_libraries(demo list_d) +# 1.B 静态库 target_link_libraries(demo list) # 3. 配置安装路径 @@ -55,3 +59,11 @@ add_test (NAME test_demo COMMAND demo 1 2 3 5 8) set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb") set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall") + +# +# 构建一个 CPack 安装包,windows还得添加打包工具 +# +# include (InstallRequiredSystemLibraries) +# set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt") +# set (CPACK_PACKAGE_VERSION_MAJOR "${VERSION}") +# include (CPack) diff --git a/License.txt b/License.txt new file mode 100644 index 0000000..e69de29 diff --git a/mk.bat b/mk.bat index 8eee1f1..753bc9f 100644 --- a/mk.bat +++ b/mk.bat @@ -4,3 +4,6 @@ cmake . -G "MinGW Makefiles" -B build make -C build make -C build install make -C build test + +@REM cpack -C ./build/CPackConfig.cmake +@REM cpack -C ./build/CPackSourceConfig.cmake diff --git a/src/CMakelists.txt b/src/CMakelists.txt index 405094d..60c8c11 100644 --- a/src/CMakelists.txt +++ b/src/CMakelists.txt @@ -3,8 +3,15 @@ aux_source_directory(. DIR_LIB_SRC) # 生成链接库 -add_library(list ${DIR_LIB_SRC}) +# add_library(list ${DIR_LIB_SRC}) +add_library(list STATIC ${DIR_LIB_SRC}) +add_library(list_d SHARED ${DIR_LIB_SRC}) -# 配置安装路径 -install (TARGETS list DESTINATION bin) +# 配置安装头文件 install (FILES list.h DESTINATION include) +# 配置安装库 +install (TARGETS list DESTINATION bin) + +# install (TARGETS list_d DESTINATION bin) +# install (TARGETS list_d DESTINATION lib) +