mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 20:59:12 +08:00
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
|
diff --git a/qml/CMakeLists.txt b/qml/CMakeLists.txt
|
||
|
|
index f74449b591bafd4ad0c41627139a08e29028ab21..a317307a438542e4cf26d50643057b5e9b649594 100644
|
||
|
|
--- a/qml/CMakeLists.txt
|
||
|
|
+++ b/qml/CMakeLists.txt
|
||
|
|
@@ -22,7 +22,7 @@ else()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
configure_file(qmldir ${IMPORTS_DIR}/qmldir)
|
||
|
|
-add_library(qmlalkimia SHARED qmlalkimiaplugin.cpp)
|
||
|
|
+add_library(qmlalkimia qmlalkimiaplugin.cpp)
|
||
|
|
target_link_libraries(qmlalkimia ${LIBS} alkimia)
|
||
|
|
|
||
|
|
install(TARGETS qmlalkimia
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index e57c94adf6c3785e5c646c7c95b586392737d686..b467849c7ff25d2ce424b30591cfe9a1e9357a46 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -103,7 +103,7 @@ endforeach()
|
||
|
|
add_definitions(-DKNSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
|
||
|
|
|
||
|
|
ki18n_wrap_ui(alkimia_LIB_SRCS ${alkimia_UI} )
|
||
|
|
-add_library(alkimia SHARED ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS})
|
||
|
|
+add_library(alkimia ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS})
|
||
|
|
|
||
|
|
kde_target_enable_exceptions(alkimia PUBLIC)
|
||
|
|
if(BUILD_QT4)
|
||
|
|
@@ -164,7 +164,13 @@ endif()
|
||
|
|
set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX})
|
||
|
|
set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
|
||
|
|
|
||
|
|
-install(TARGETS alkimia
|
||
|
|
+if(${BUILD_SHARED_LIBS})
|
||
|
|
+ set(alkimia_export_targets alkimia)
|
||
|
|
+else()
|
||
|
|
+ set(alkimia_export_targets alkimia alkimia-internal)
|
||
|
|
+endif()
|
||
|
|
+
|
||
|
|
+install(TARGETS ${alkimia_export_targets}
|
||
|
|
EXPORT alkimiaTargets
|
||
|
|
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||
|
|
)
|
||
|
|
@@ -228,7 +234,7 @@ configure_package_config_file(
|
||
|
|
|
||
|
|
########### install files ###############
|
||
|
|
|
||
|
|
-export(TARGETS alkimia
|
||
|
|
+export(TARGETS ${alkimia_export_targets}
|
||
|
|
FILE "${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Targets.cmake"
|
||
|
|
NAMESPACE Alkimia::
|
||
|
|
)
|
||
|
|
diff --git a/src/LibAlkimiaConfig.cmake.in b/src/LibAlkimiaConfig.cmake.in
|
||
|
|
index a8893c6fe347ce2d2fe1e0a2854a206e0e41901c..8dcfdf8c13f4306a349052d1c4194e65725a50b4 100644
|
||
|
|
--- a/src/LibAlkimiaConfig.cmake.in
|
||
|
|
+++ b/src/LibAlkimiaConfig.cmake.in
|
||
|
|
@@ -12,6 +12,15 @@ else()
|
||
|
|
endif()
|
||
|
|
find_dependency(@MP_CMAKE_MODULE@)
|
||
|
|
|
||
|
|
+if (NOT @BUILD_SHARED_LIBS@)
|
||
|
|
+ find_dependency(KF5Completion)
|
||
|
|
+ find_dependency(KF5I18n)
|
||
|
|
+ find_dependency(KF5NewStuff)
|
||
|
|
+ find_dependency(KF5IconThemes)
|
||
|
|
+ find_dependency(KF5TextWidgets)
|
||
|
|
+ find_dependency(KF5KIO)
|
||
|
|
+endif()
|
||
|
|
+
|
||
|
|
include("${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Targets.cmake")
|
||
|
|
|
||
|
|
set_and_check(LIBALKIMIA_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|