瀏覽代碼

fix: 不应使用 INTERFACE_INCLUDE_DIRECTORIES 引入暂不存在的位置

zinface 2 年之前
父節點
當前提交
721bfdb056
共有 2 個文件被更改,包括 7 次插入4 次删除
  1. 3 1
      src/plugin/linux-terminal-plugin/CMakeLists.txt
  2. 4 3
      src/plugin/opencc-demo-plugin/CMakeLists.txt

+ 3 - 1
src/plugin/linux-terminal-plugin/CMakeLists.txt

@@ -112,8 +112,10 @@ add_library(qtermwidget SHARED IMPORTED)
 set_target_properties(qtermwidget
 set_target_properties(qtermwidget
     PROPERTIES
     PROPERTIES
         IMPORTED_LOCATION ${qtermwidget_git-install}/lib/${libqtermwidget5_lib}
         IMPORTED_LOCATION ${qtermwidget_git-install}/lib/${libqtermwidget5_lib}
-        INTERFACE_INCLUDE_DIRECTORIES ${qtermwidget_git-install}/include
         INTERFACE_LINK_DIRECTORIES ${qtermwidget_git-install}/lib)
         INTERFACE_LINK_DIRECTORIES ${qtermwidget_git-install}/lib)
+target_include_directories(${LOCAL_PLUGIN_NAME}
+    PUBLIC 
+        ${qtermwidget_git-install}/include)
 
 
 # ----------------- linux-terminal-plugin 构建的外部项目依赖 ----------------- #
 # ----------------- linux-terminal-plugin 构建的外部项目依赖 ----------------- #
 # 1.明确声明 qtermwidget_git 依赖于 lxqt-build-tool 
 # 1.明确声明 qtermwidget_git 依赖于 lxqt-build-tool 

+ 4 - 3
src/plugin/opencc-demo-plugin/CMakeLists.txt

@@ -118,8 +118,10 @@ add_library(opencc STATIC IMPORTED)
 set_target_properties(opencc
 set_target_properties(opencc
     PROPERTIES
     PROPERTIES
         IMPORTED_LOCATION        ${libopencc_install}/lib/${libopencc_lib}
         IMPORTED_LOCATION        ${libopencc_install}/lib/${libopencc_lib}
-        INTERFACE_LINK_LIBRARIES ${libopencc_install}/lib/${libmarisa_lib}
-        INTERFACE_INCLUDE_DIRECTORIES ${libopencc_install}/include)
+        INTERFACE_LINK_LIBRARIES ${libopencc_install}/lib/${libmarisa_lib})
+target_include_directories(${LOCAL_PLUGIN_NAME}
+    PUBLIC 
+        ${libopencc_install}/include)
 
 
 # ----------------------------------------------------------------
 # ----------------------------------------------------------------
 
 
@@ -128,7 +130,6 @@ add_dependencies(${LOCAL_PLUGIN_NAME}      opencc_git)
 target_link_libraries(${LOCAL_PLUGIN_NAME} opencc)
 target_link_libraries(${LOCAL_PLUGIN_NAME} opencc)
 
 
 if(WIN32)
 if(WIN32)
-    target_include_directories(${LOCAL_PLUGIN_NAME} PUBLIC ${libopencc_install}/include)
     target_compile_definitions(${LOCAL_PLUGIN_NAME} 
     target_compile_definitions(${LOCAL_PLUGIN_NAME} 
         PRIVATE 
         PRIVATE 
             OPENCC_EXPORT=)
             OPENCC_EXPORT=)