diff options
| author | liuxueli <[email protected]> | 2020-09-05 16:50:24 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-09-05 16:50:24 +0800 |
| commit | d1e9421588667cd2723fe36e95090629940e451a (patch) | |
| tree | fc8fbc0e350e07cddfc79e213502e641bcc1dc6a | |
| parent | 90d8051ef1b6c1531db329c077edce23f173cca4 (diff) | |
修复app_master依赖关系报错的问题v1.0.6
| -rw-r--r-- | cmake/Package.cmake | 16 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 16 |
2 files changed, 17 insertions, 15 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index cdafed2..3f2c8aa 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -30,13 +30,13 @@ set(CPACK_COMPONENTS_IGNORE_GROUPS 1) set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") -set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE) -set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) -set(CPACK_RPM_LIBRARY_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE) +set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) +set(CPACK_RPM_LIBRARIES_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") +set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_COMPONENT_LIBRARY_GROUP "library") -set(CPACK_COMPONENT_PROFILE_GROUP "library") +set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries") +set(CPACK_COMPONENT_PROFILE_GROUP "libraries") set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") @@ -44,10 +44,10 @@ set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_COMPONENT_HEADER_GROUP "header") -set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME}) +set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME}) set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) -set(CPACK_COMPONENTS_ALL LIBRARY PROFILE HEADER) +set(CPACK_COMPONENTS_ALL LIBRARIES PROFILE HEADER) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 157f6bf..5f01ca5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,15 +6,17 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/../support/install/include/luaj SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -shared -fPIC") SET(CMAKE_CXX_DEBUG_FLAGS "${CMAKE_CXX_DEBUG_FLAGS} -DTSG_LUA_DEBUG") SET(CMAKE_BUILD_TYPE "Release") -add_library(${lib_name}_static ${DIR_LIB_SRCS}) -add_library(${lib_name}_shared SHARED ${DIR_LIB_SRCS}) -set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) -add_dependencies(${lib_name}_static luajit2-static) -add_dependencies(${lib_name} luajit2-static) +add_library(${lib_name}_shared SHARED ${DIR_LIB_SRCS}) target_link_libraries(${lib_name}_shared dl luajit2-static) +set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) #set_target_properties(${lib_name} PROPERTIES PREFIX "") +#set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) + +#add_library(${lib_name}_static ${DIR_LIB_SRCS}) +#add_dependencies(${lib_name}_static luajit2-static) +#set_target_properties(${lib_name}_static PROPERTIES PREFIX "") -install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY) -install(TARGETS ${lib_name}_static LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
\ No newline at end of file +install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES) +#install(TARGETS ${lib_name}_static LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY) |