20200904v1.0.7

3 files changed, 30 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa19bf0..49a428e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,13 +11,11 @@ set(CMAKE_MACOSX_RPATH 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
 
-set(CMAKE_INSTALL_PREFIX /usr/local/lib)
+set(CMAKE_INSTALL_PREFIX /opt/MESA)
 
 add_subdirectory(support) 
 add_subdirectory(src) 
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libtsglua.so DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT PROFILE)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libtsglua.a DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT PROFILE)
-
-include(Package)
+install(FILES ./src/tsg_lua_interface.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
 
+include(Package)
\ No newline at end of file
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 5b2d61c..3f2c8aa 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -1,7 +1,7 @@
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(MY_RPM_NAME_PREFIX "${lib_name}-debug")
+    set(MY_RPM_NAME_PREFIX "lib${lib_name}-debug")
 else()
-    set(MY_RPM_NAME_PREFIX "${lib_name}")
+    set(MY_RPM_NAME_PREFIX "lib${lib_name}")
 endif()
 
 message(STATUS "Package: ${MY_RPM_NAME_PREFIX}")
@@ -30,17 +30,24 @@ 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")
+set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+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_LIBRARIES_PACKAGE_NAME})
 set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
 
-set(CPACK_COMPONENTS_ALL LIBRARY PROFILE)
+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 85805a8..5f01ca5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,16 +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(tsglua_static ${DIR_LIB_SRCS})
-add_library(tsglua SHARED ${DIR_LIB_SRCS})
-set_target_properties(tsglua_static PROPERTIES OUTPUT_NAME "tsglua")
 
-add_dependencies(tsglua_static luajit2-static)
-add_dependencies(tsglua luajit2-static)
-target_link_libraries(tsglua dl luajit2-static)
-#set_target_properties(tsglua  PROPERTIES PREFIX "")
+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})
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtsglua.so DESTINATION ${PROJECT_SOURCE_DIR}/lib COMPONENT PROFILE)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtsglua.a DESTINATION ${PROJECT_SOURCE_DIR}/lib COMPONENT PROFILE)
-install(FILES ${PROJECT_SOURCE_DIR}/src/tsg_lua_interface.h DESTINATION ${PROJECT_SOURCE_DIR}/include COMPONENT PROFILE)
+#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 LIBRARIES)
+#install(TARGETS ${lib_name}_static  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)