From c0d32c6ea72d9d34bd8ef05bb37561badf2f62d7 Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Sun, 15 Nov 2020 01:10:47 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BD=BF=E7=94=A8cmake=20find=5Fpackage?= =?UTF-8?q?=E6=9D=A5=E8=A7=84=E8=8C=83=E5=8C=96=E5=BC=95=E5=85=A5=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba9af44..13d58a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,13 @@ target_link_libraries(generallib public libevent.a -Wl,--no-whole-archive ) +find_package(libevent REQUIRED) +set(EVENT__HAVE_LIBEVENT 1) + +message(STATUS "libevent include: ${libevent_INCLUDE_DIR}") +message(STATUS "libevent lib: ${libevent_LIBRARIES}") +message(STATUS "libevent lib Dirs: ${libevent_LIB_DIRS}") + message("current path is" ${CMAKE_CURRENT_SOURCE_DIR}) IF (WIN32) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") @@ -29,7 +36,6 @@ IF (WIN32) ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a COMMENT "package library ar -x ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a " ) - add_custom_command ( TARGET generallib POST_BUILD COMMAND ar rc libgeneral.a *.obj From 526c77dd0e9efe26986a17954adefbefd9fc09cf Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Sun, 15 Nov 2020 12:32:38 +0800 Subject: [PATCH 2/9] no message --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13d58a4..14db3af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,12 +30,12 @@ IF (WIN32) message("using clang") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") message("using gcc") - add_custom_command ( - TARGET generallib POST_BUILD - COMMAND ar -x - ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a - COMMENT "package library ar -x ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a " - ) + #add_custom_command ( + # TARGET generallib POST_BUILD + # COMMAND ar -x + # ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a + # COMMENT "package library ar -x ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a " + # ) add_custom_command ( TARGET generallib POST_BUILD COMMAND ar rc libgeneral.a *.obj From 5e65ec6a721fb92a2e55e3efa1d3a053e494715d Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Sun, 15 Nov 2020 16:32:29 +0800 Subject: [PATCH 3/9] no message --- CMakeLists.txt | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14db3af..b205b0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,14 @@ message("current make is " ${CMAKE_MAKE_PROGRAM}) enable_language(CXX) project(generallib) add_subdirectory(general) + +find_package(libevent REQUIRED) +set(EVENT__HAVE_LIBEVENT 1) + +message(STATUS "libevent include: ${libevent_INCLUDE_DIR}") +message(STATUS "libevent lib: ${libevent_LIBRARIES}") +message(STATUS "libevent lib Dirs: ${libevent_LIB_DIRS}") +message(STATUS "library files : " $ SET(SRC_SDK sdk_main.c test/src/heapsort/main.c)#生成动态库需要至少包含一个源文件 add_library(generallib STATIC $ ${SRC_SDK}) message("CMAKE_BINARY_DIR is " ${CMAKE_BINARY_DIR}) @@ -17,12 +25,7 @@ target_link_libraries(generallib public libevent.a -Wl,--no-whole-archive ) -find_package(libevent REQUIRED) -set(EVENT__HAVE_LIBEVENT 1) -message(STATUS "libevent include: ${libevent_INCLUDE_DIR}") -message(STATUS "libevent lib: ${libevent_LIBRARIES}") -message(STATUS "libevent lib Dirs: ${libevent_LIB_DIRS}") message("current path is" ${CMAKE_CURRENT_SOURCE_DIR}) IF (WIN32) @@ -30,12 +33,12 @@ IF (WIN32) message("using clang") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") message("using gcc") - #add_custom_command ( - # TARGET generallib POST_BUILD - # COMMAND ar -x - # ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a - # COMMENT "package library ar -x ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a " - # ) + add_custom_command ( + TARGET generallib POST_BUILD + COMMAND ar -x + ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a + COMMENT "package library ar -x ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a " + ) add_custom_command ( TARGET generallib POST_BUILD COMMAND ar rc libgeneral.a *.obj From d32dae096e005a9ecba0829d61310be2c772bc62 Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Sun, 15 Nov 2020 16:34:39 +0800 Subject: [PATCH 4/9] no message --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b205b0c..0aa5613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,8 @@ set(EVENT__HAVE_LIBEVENT 1) message(STATUS "libevent include: ${libevent_INCLUDE_DIR}") message(STATUS "libevent lib: ${libevent_LIBRARIES}") message(STATUS "libevent lib Dirs: ${libevent_LIB_DIRS}") -message(STATUS "library files : " $ +message(STATUS "library files : $" ) + SET(SRC_SDK sdk_main.c test/src/heapsort/main.c)#生成动态库需要至少包含一个源文件 add_library(generallib STATIC $ ${SRC_SDK}) message("CMAKE_BINARY_DIR is " ${CMAKE_BINARY_DIR}) From 6dda938804c73480f12a5bce4320378441473ebd Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Sun, 15 Nov 2020 16:37:45 +0800 Subject: [PATCH 5/9] no message --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aa5613..ecd0a4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ add_subdirectory(general) find_package(libevent REQUIRED) set(EVENT__HAVE_LIBEVENT 1) -message(STATUS "libevent include: ${libevent_INCLUDE_DIR}") +message(STATUS "libevent include: " ${libevent_INCLUDE_DIR}) message(STATUS "libevent lib: ${libevent_LIBRARIES}") message(STATUS "libevent lib Dirs: ${libevent_LIB_DIRS}") message(STATUS "library files : $" ) From a31f56e7b8be2d86d1fb17abf96551aeba1fa72b Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Sun, 15 Nov 2020 16:49:41 +0800 Subject: [PATCH 6/9] no message --- CMakeLists.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ecd0a4e..43bfde9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set(EVENT__HAVE_LIBEVENT 1) message(STATUS "libevent include: " ${libevent_INCLUDE_DIR}) message(STATUS "libevent lib: ${libevent_LIBRARIES}") message(STATUS "libevent lib Dirs: ${libevent_LIB_DIRS}") -message(STATUS "library files : $" ) - +message(STATUS "library files : " ) +message(STATUS $ ) SET(SRC_SDK sdk_main.c test/src/heapsort/main.c)#生成动态库需要至少包含一个源文件 add_library(generallib STATIC $ ${SRC_SDK}) message("CMAKE_BINARY_DIR is " ${CMAKE_BINARY_DIR}) @@ -31,25 +31,25 @@ target_link_libraries(generallib public message("current path is" ${CMAKE_CURRENT_SOURCE_DIR}) IF (WIN32) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - message("using clang") + #message("using clang") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - message("using gcc") - add_custom_command ( - TARGET generallib POST_BUILD - COMMAND ar -x - ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a - COMMENT "package library ar -x ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a " - ) - add_custom_command ( - TARGET generallib POST_BUILD - COMMAND ar rc libgeneral.a *.obj - COMMENT "package library ar rc *.o " - ) - add_custom_command( - TARGET generallib POST_BUILD - COMMAND del *.o *.obj - COMMENT "remove all step library" - ) + #message("using gcc") + #add_custom_command ( + # TARGET generallib POST_BUILD + # COMMAND ar -x + # ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a + # COMMENT "package library ar -x ${CMAKE_CURRENT_SOURCE_DIR}/libd/libevent.a " + #) + #add_custom_command ( + # TARGET generallib POST_BUILD + # COMMAND ar rc libgeneral.a *.obj + # COMMENT "package library ar rc *.o " + #) + #add_custom_command( + # TARGET generallib POST_BUILD + # COMMAND del *.o *.obj + # COMMENT "remove all step library" + #) # using GCC elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") message("using asm") From e859f107ef9f73fb7a5f540b49a263ca14153cf5 Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Wed, 18 Nov 2020 00:40:46 +0800 Subject: [PATCH 7/9] no message --- CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43bfde9..b813b45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.11) -message( "current compiler " ${CMAKE_CXX_COMPILER_ID}) -message("current CXX compiler is " ${CMAKE_CXX_COMPILER}) -message("current X compiler is " ${CMAKE_CXX_COMPILER}) -message("current make is " ${CMAKE_MAKE_PROGRAM}) enable_language(CXX) project(generallib) add_subdirectory(general) @@ -11,15 +7,15 @@ find_package(libevent REQUIRED) set(EVENT__HAVE_LIBEVENT 1) message(STATUS "libevent include: " ${libevent_INCLUDE_DIR}) -message(STATUS "libevent lib: ${libevent_LIBRARIES}") -message(STATUS "libevent lib Dirs: ${libevent_LIB_DIRS}") -message(STATUS "library files : " ) -message(STATUS $ ) +message(STATUS "libevent lib: " ${libevent_LIBRARIES}) +message(STATUS "libevent lib Dirs: " ${libevent_LIB_DIRS}) + SET(SRC_SDK sdk_main.c test/src/heapsort/main.c)#生成动态库需要至少包含一个源文件 add_library(generallib STATIC $ ${SRC_SDK}) + message("CMAKE_BINARY_DIR is " ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/libd) -link_directories(general/third/lib) +link_directories(${libevent_LIB_DIRS}) set_target_properties(generallib PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries(generallib public -Wl,--whole-archive From 172b9609bd2f052483a285617f6bbbc30292621f Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Thu, 19 Nov 2020 23:28:05 +0800 Subject: [PATCH 8/9] no message --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b813b45..01a7578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,11 +65,11 @@ file(COPY ${INCLUDES} DESTINATION ${LIBRARY_OUTPUT_PATH}/inc message("include dir " ${INCLUDES}) file(GLOB PatternINCLUDES ${PROJECT_SOURCE_DIR}/general/src/pattern/*) -file(COPY ${PatternINCLUDES} DESTINATION ${LIBRARY_OUTPUT_PATH}/inc +file(COPY ${PatternINCLUDES} DESTINATION ${LIBRARY_OUTPUT_PATH}/inc/pattern FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_WRITE GROUP_READ WORLD_READ) message( "copy pattern library" ${PatternINCLUDES}) file(GLOB EncryptINCLUDES ${PROJECT_SOURCE_DIR}/general/src/encrypt/*.h) -file(COPY ${EncryptINCLUDES} DESTINATION ${LIBRARY_OUTPUT_PATH}/inc +file(COPY ${EncryptINCLUDES} DESTINATION ${LIBRARY_OUTPUT_PATH}/inc/encrypt FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_WRITE GROUP_READ WORLD_READ) file(GLOB MathINCLUDES ${PROJECT_SOURCE_DIR}/general/src/math/*.hpp) message( "copy math library" ${MathINCLUDES}) From c45c31abb47c77cd81173ce57c6afe9a101be3a6 Mon Sep 17 00:00:00 2001 From: caiyuzheng <290198252@qq.com> Date: Fri, 20 Nov 2020 00:07:41 +0800 Subject: [PATCH 9/9] no message --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01a7578..f376690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ message(STATUS "libevent include: " ${libevent_INCLUDE_DIR}) message(STATUS "libevent lib: " ${libevent_LIBRARIES}) message(STATUS "libevent lib Dirs: " ${libevent_LIB_DIRS}) -SET(SRC_SDK sdk_main.c test/src/heapsort/main.c)#生成动态库需要至少包含一个源文件 +SET(SRC_SDK sdk_main.c )#生成动态库需要至少包含一个源文件 add_library(generallib STATIC $ ${SRC_SDK}) message("CMAKE_BINARY_DIR is " ${CMAKE_BINARY_DIR})