修复CI编译错误.

.gitlab-ci.yml

@@ -77,7 +77,7 @@ develop_build_debug:
     PULP3_REPO_NAME: framework-testing-x86_64.el7
     PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
-    name: MESA_jump_layer-$CI_COMMIT_REF_NAME-debug"
+    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-debug"
     paths:
       - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
       - /builds/MESA_framework/mesa_jump_layer/build/src/libMESA_jump_layer.so      
@@ -98,7 +98,7 @@ develop_build_release:
     PULP3_REPO_NAME: framework-testing-x86_64.el7
     PULP3_DIST_NAME: framework-testing-x86_64.el7
   artifacts:
-    name: MESA_jump_layer-$CI_COMMIT_REF_NAME-release"
+    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
     paths:
       - build/*.rpm
       - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
@@ -117,7 +117,7 @@ release_build_debug:
     PULP3_DIST_NAME: framework-stable-x86_64.el7
   extends: .build_by_travis
   artifacts:
-    name: MESA_jump_layer-$CI_COMMIT_REF_NAME-debug"
+    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
     paths:
       - build/*.rpm
       - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer
@@ -137,7 +137,7 @@ release_build_release:
     PULP3_DIST_NAME: framework-stable-x86_64.el7
   extends: .build_by_travis
   artifacts:
-    name: MESA_jump_layer-$CI_COMMIT_REF_NAME-release"
+    name: libMESA_jump_layer-$CI_COMMIT_REF_NAME-release"
     paths:
       - build/*.rpm
       - /builds/MESA_framework/mesa_jump_layer/build/test/gtest_jump_layer

src/CMakeLists.txt

@@ -19,9 +19,18 @@ add_definitions(-std=c++11)
 
 set(SRC MESA_jump_layer.cpp)
 
-add_library(${lib_name} SHARED ${SRC})		
+# Shared Library Output
-target_link_libraries(${lib_name} m)
+add_library(${lib_name}_shared SHARED ${SRC})
+target_link_libraries(${lib_name}_shared m)
+if(DEFINED MESA_SHARED_INSTALL_DIR)
+	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name} LIBRARY_OUTPUT_DIRECTORY ${MESA_SHARED_INSTALL_DIR})
+else()
+	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name})
+endif()
 
+target_link_libraries(${lib_name}_shared m)
 
-install(FILES ${CMAKE_BINARY_DIR}/src/libMESA_jump_layer.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
+install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
+#install(FILES ${CMAKE_BINARY_DIR}/src/libMESA_jump_layer.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
 
+include(Package)