fix:修改对freewbConversionTool的链接,不再链接lib/目录下的so

CMakeLists.txt

@@ -43,10 +43,6 @@ add_definitions("-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\"")
 
 install( DIRECTORY ${PROJECT_SOURCE_DIR}/help
          DESTINATION /usr/share/freewb )
-
-install( DIRECTORY ${PROJECT_SOURCE_DIR}/lib
-         DESTINATION /usr/share/freewb )
-
  
 configure_file(config.h.in ${CMAKE_SOURCE_DIR}/include/config.h
   IMMEDIATE @ONLY)

lib/libfreewbConversionTool.so

@@ -1 +0,0 @@
-libfreewbConversionTool.so.1

lib/libfreewbConversionTool.so.1

@@ -1 +0,0 @@
-libfreewbConversionTool.so.1.0

src/panel/CMakeLists.txt

@@ -36,13 +36,7 @@ include_directories(
 
 
 #链接外部动态库
-if ( "$ENV{DESKTOP_SESSION}" STREQUAL "mate" )
-set( EXTERN_LIBS -ldl -lX11 -lXext -lpthread ${PROJECT_SOURCE_DIR}/../../lib/libfreewbConversionTool.so /usr/lib/aarch64-linux-gnu/libXtst.so.6.1.0 ) #银河麒麟系统
-else()
-set( EXTERN_LIBS -ldl -lX11 -lXtst -lXext -lpthread ${PROJECT_SOURCE_DIR}/../../lib/libfreewbConversionTool.so ) #Ubuntu以及其他Linux
-endif()
-
-
+set( EXTERN_LIBS -ldl -lX11 -lXtst -lXext -lpthread freewbConversionTool )
 
 #编译
 add_executable( ${PROJECT_NAME} ${SRC_FILES} ${UI_FILES} ${QRC_FILES} )