1
0
Эх сурвалжийг харах

build(QScint): 更新 QSci 库的构建方式

- 使用绝对路径替换相对路径设置 QSciSources
- 用 spark_add_library_path 替代 spark_add_library 进行库构建
- 调整目标包含目录的指定方式
zinface 5 сар өмнө
parent
commit
c15570d894

+ 8 - 8
cmake/modules/QScint.cmake

@@ -11,20 +11,20 @@ if(TRUE)
     # file(GLOB MOC_HEADER src/qscint/src/Qsci/*.h)
     spark_file_glob(MOC_HEADER "src/qscint/src/Qsci/*.h")
 
-    spark_add_source_paths(QSciSources
-        src/qscint/src
-        src/qscint/scintilla/lexers
-        src/qscint/scintilla/lexlib
-        src/qscint/scintilla/src
-        src/qscint/scintilla/boostregex
+    set(QSciSources
+        ${PROJECT_SOURCE_DIR}/src/qscint/src
+        ${PROJECT_SOURCE_DIR}/src/qscint/scintilla/lexers
+        ${PROJECT_SOURCE_DIR}/src/qscint/scintilla/lexlib
+        ${PROJECT_SOURCE_DIR}/src/qscint/scintilla/src
+        ${PROJECT_SOURCE_DIR}/src/qscint/scintilla/boostregex
 
         # src/qscint/src/Qsci
         # FAIL: only *.ui will spark_file_glob(MOC_HEADER ...)
     )
     if(NOTEPAD_BUILD_BY_SHARED)
-        spark_add_library(QSci SHARED ${QSciSources} ${MOC_HEADER})
+        spark_add_library_path(QSci SHARED ${QSciSources} ${MOC_HEADER})
     else()
-        spark_add_library(QSci STATIC ${QSciSources} ${MOC_HEADER})
+        spark_add_library_path(QSci STATIC ${QSciSources} ${MOC_HEADER})
     endif(NOTEPAD_BUILD_BY_SHARED)
     target_include_directories(QSci PRIVATE
         src/qscint/scintilla/boostregex