diff --git a/3rdparty/ext_seexpr/CMakeLists.txt b/3rdparty/ext_seexpr/CMakeLists.txt index 007415abaa..3d7fd7ebc0 100644 --- a/3rdparty/ext_seexpr/CMakeLists.txt +++ b/3rdparty/ext_seexpr/CMakeLists.txt @@ -1,11 +1,12 @@ SET(PREFIX_ext_seexpr "${EXTPREFIX}" ) ExternalProject_Add( ext_seexpr GIT_REPOSITORY https://invent.kde.org/lsegovia/SeExpr.git - GIT_TAG aa5253ac81bfa1d26909402b9c70299cb4782c05 + GIT_TAG ef6d1ae2a618c55bdb42337340777c145ea0f672 CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_seexpr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBOOST_INCLUDE_DIR=${PREFIX_ext_seexpr}/include -DBOOST_ROOT=${PREFIX_ext_seexpr} -DBOOST_LIB_DIR=${PREFIX_ext_seexpr}/lib -DENABLE_LLVM_BACKEND=OFF -DENABLE_SSE4=OFF -DBUILD_DOC=OFF -DBUILD_TESTS=OFF -DBUILD_UTILS=OFF -DUSE_PYTHON=OFF UPDATE_COMMAND "" + # TODO when moving this library to a packaged release, please add ext_extra_cmake_modules so that translations can be built in DEPENDS ext_qt ) diff --git a/plugins/generators/seexpr/CMakeLists.txt b/plugins/generators/seexpr/CMakeLists.txt index 5c9e1a3431..f60cf70497 100644 --- a/plugins/generators/seexpr/CMakeLists.txt +++ b/plugins/generators/seexpr/CMakeLists.txt @@ -1,22 +1,19 @@ -include_directories(SYSTEM ${SeExpr2_INCLUDE_DIRS}) - set(kritaseexprgenerator_SOURCES SeExprVariable.cpp SeExprExpressionContext.cpp generator.cpp kis_wdg_seexpr.cpp ) ki18n_wrap_ui(kritaseexprgenerator_SOURCES wdgseexpr.ui ) add_library(kritaseexprgenerator MODULE ${kritaseexprgenerator_SOURCES}) -target_link_directories(kritaseexprgenerator PRIVATE ${SeExpr2_LIBRARY_DIRS}) -target_link_libraries(kritaseexprgenerator kritaui SeExpr2 SeExpr2Editor) +target_link_libraries(kritaseexprgenerator kritaui SeExpr2::SeExpr2 SeExpr2::SeExpr2Editor) install(TARGETS kritaseexprgenerator DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) add_subdirectory(tests)