openkylin
/
freewb-deb
mirror of https://gitee.com/openkylin/freewb-deb.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix:删除无效代码

This commit is contained in:
hantengc 2024-09-18 15:45:35 +08:00
parent ffb74cc69d
commit 1f8cfa2e1d
2 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -24,18 +24,6 @@ find_package(DBus1 REQUIRED)
# This will add a uninstall target. Comment out this line if other cmake packages # This will add a uninstall target. Comment out this line if other cmake packages
# you are using already provides such target (e.g. KDE). # you are using already provides such target (e.g. KDE).
option(ENABLE_DBUS "Enable DBus Support" ON)
set(_ENABLE_DBUS 1)
# option(ENABLE_OPENCC "Enable OpenCC for Chinese Transform" ON)
# option(FORCE_OPENCC
# "Enable opencc even if the library is not found at compile time" Off)
# if(ENABLE_OPENCC)
# find_package(OpenCC REQUIRED)
# if(NOT (OPENCC_FOUND OR FORCE_OPENCC))
# set(ENABLE_OPENCC Off)
# endif()
# endif()
_fcitx_add_uninstall_target() _fcitx_add_uninstall_target()
include_directories(${FCITX4_FCITX_INCLUDE_DIRS}) include_directories(${FCITX4_FCITX_INCLUDE_DIRS})
include_directories(${FCITX4_FCITX_CONFIG_INCLUDE_DIRS}) include_directories(${FCITX4_FCITX_CONFIG_INCLUDE_DIRS})
@ -48,13 +36,9 @@ include_directories("${PROJECT_BINARY_DIR}/src")
include_directories(${DBus1_INCLUDE_DIRS}) include_directories(${DBus1_INCLUDE_DIRS})
link_directories(${DBus1_LIBRARY_DIRS}) link_directories(${DBus1_LIBRARY_DIRS})
#include_directories(${PROJECT_SOURCE_DIR}/src/)
message(STATUS "fcitx install prefix dir is:" ${FCITX4_PREFIX}) message(STATUS "fcitx install prefix dir is:" ${FCITX4_PREFIX})
#message(STATUS "dbus include dir is:" ${DBUS_INCLUDE_DIRS})
# set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}")
# set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}")
# set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
# set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
add_definitions("-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\"") add_definitions("-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\"")
install( DIRECTORY ${PROJECT_SOURCE_DIR}/help install( DIRECTORY ${PROJECT_SOURCE_DIR}/help
@ -71,5 +55,4 @@ configure_file(config.h.in config.h
# related sources are processed. # related sources are processed.
add_subdirectory(po) add_subdirectory(po)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(data) add_subdirectory(data)
#add_subdirectory(config)

20
src/panel/CMakeLists.txt
View File

@ -1,20 +1,6 @@
project( Freewb ) project( Freewb )
cmake_minimum_required( VERSION 3.1.0 ) cmake_minimum_required( VERSION 3.1.0 )
#产生配置头文件config.h供源代码编译的时候包含
#configure_file( ${PROJECT_SOURCE_DIR}/config.h.in
# ${PROJECT_SOURCE_DIR}/src/config.h )
#编译发布版本
set( CMAKE_BUILD_TYPE Release ) #Debug or Release
set( QT_PATH "/opt/qt5.12.3/aarch64" CACHE PATH "qt5 cmake dir")
set( QT_VERSION 5.12.3)
set( CMAKE_PREFIX_PATH ${QT_PATH})
#set( CMAKE_INSTALL_RPATH "/usr/share/freewb/lib")
#set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
#CMAKE编译标志 #CMAKE编译标志
add_definitions( -DBUILD_IN_CAMKE ) add_definitions( -DBUILD_IN_CAMKE )
@ -70,9 +56,6 @@ target_link_libraries( ${PROJECT_NAME}
${Qt5DBus_LIBRARIES} ${Qt5DBus_LIBRARIES}
${EXTERN_LIBS} ) ${EXTERN_LIBS} )
#可执行文件输出目录
#set( EXECUTABLE_OUTPUT_PATH /usr/bin )
#安装路径 #安装路径
set( INSTALL_ROOT_DIR /usr/share/freewb ) set( INSTALL_ROOT_DIR /usr/share/freewb )
#安装可执行文件 #安装可执行文件
@ -94,6 +77,3 @@ install( DIRECTORY ${PROJECT_SOURCE_DIR}/data
install( DIRECTORY ${PROJECT_SOURCE_DIR}/config install( DIRECTORY ${PROJECT_SOURCE_DIR}/config
DESTINATION ${INSTALL_ROOT_DIR} ) DESTINATION ${INSTALL_ROOT_DIR} )
#查看变量值
#message( ${Xtst_FOUND} )