mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 10:41:49 +08:00
128 lines
6.4 KiB
Diff
128 lines
6.4 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 8894a58..d2f8b2f 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -960,6 +960,9 @@ else()
|
||
|
|
set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
|
||
|
|
endif()
|
||
|
|
+set(FREERDP_DATA_PATH "share/freerdp")
|
||
|
|
+set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
+set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
|
||
|
|
set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
|
||
|
|
|
||
|
|
# Path to put extensions
|
||
|
|
diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
|
||
|
|
index 6274571..b0a5d27 100644
|
||
|
|
--- a/client/Windows/CMakeLists.txt
|
||
|
|
+++ b/client/Windows/CMakeLists.txt
|
||
|
|
@@ -82,7 +82,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32)
|
||
|
|
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
|
||
|
|
|
||
|
|
if(WITH_CLIENT_INTERFACE)
|
||
|
|
- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
||
|
|
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries)
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
|
||
|
|
install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
|
||
|
|
endif()
|
||
|
|
diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
|
||
|
|
index b465a63..1de7461 100644
|
||
|
|
--- a/client/common/CMakeLists.txt
|
||
|
|
+++ b/client/common/CMakeLists.txt
|
||
|
|
@@ -78,7 +78,7 @@ else()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
|
||
|
|
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
|
||
|
|
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
|
||
|
|
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
|
||
|
|
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
|
||
|
|
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
|
||
|
|
index a259b68..10a0921 100644
|
||
|
|
--- a/libfreerdp/CMakeLists.txt
|
||
|
|
+++ b/libfreerdp/CMakeLists.txt
|
||
|
|
@@ -396,7 +396,7 @@ endif()
|
||
|
|
|
||
|
|
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr)
|
||
|
|
|
||
|
|
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
|
||
|
|
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDPTargets)
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
|
||
|
|
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
|
||
|
|
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
|
||
|
|
diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
|
||
|
|
index c7833ad..4086542 100644
|
||
|
|
--- a/server/Windows/CMakeLists.txt
|
||
|
|
+++ b/server/Windows/CMakeLists.txt
|
||
|
|
@@ -98,7 +98,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server freerdp)
|
||
|
|
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
|
||
|
|
|
||
|
|
if(WITH_SERVER_INTERFACE)
|
||
|
|
- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
||
|
|
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries)
|
||
|
|
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
|
||
|
|
install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
|
||
|
|
diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt
|
||
|
|
index c94a209..7c533b7 100644
|
||
|
|
--- a/server/common/CMakeLists.txt
|
||
|
|
+++ b/server/common/CMakeLists.txt
|
||
|
|
@@ -63,7 +63,7 @@ endif()
|
||
|
|
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_SERVER_LIBS})
|
||
|
|
target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} winpr freerdp)
|
||
|
|
|
||
|
|
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
|
||
|
|
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
|
||
|
|
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
|
||
|
|
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
|
||
|
|
diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
|
||
|
|
index 3e0df0b..0daa245 100644
|
||
|
|
--- a/server/shadow/CMakeLists.txt
|
||
|
|
+++ b/server/shadow/CMakeLists.txt
|
||
|
|
@@ -86,7 +86,7 @@ if (WITH_LIBRARY_VERSIONING)
|
||
|
|
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
|
||
|
|
endif()
|
||
|
|
|
||
|
|
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets)
|
||
|
|
+install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets)
|
||
|
|
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC)
|
||
|
|
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
|
||
|
|
@@ -291,7 +291,7 @@ if (WITH_LIBRARY_VERSIONING)
|
||
|
|
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
|
||
|
|
endif()
|
||
|
|
|
||
|
|
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets)
|
||
|
|
+install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets)
|
||
|
|
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC)
|
||
|
|
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
|
||
|
|
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
|
||
|
|
index 2df8d89..da23a1b 100644
|
||
|
|
--- a/winpr/libwinpr/CMakeLists.txt
|
||
|
|
+++ b/winpr/libwinpr/CMakeLists.txt
|
||
|
|
@@ -144,7 +144,7 @@ endif()
|
||
|
|
|
||
|
|
add_definitions(${WINPR_DEFINITIONS})
|
||
|
|
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS_PRIVATE} ${PUBLIC_KEYWORD} ${WINPR_LIBS_PUBLIC})
|
||
|
|
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
|
||
|
|
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
|
||
|
|
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
|
||
|
|
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
|
||
|
|
diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
|
||
|
|
index 0ddf9fb..b89a954 100644
|
||
|
|
--- a/winpr/tools/CMakeLists.txt
|
||
|
|
+++ b/winpr/tools/CMakeLists.txt
|
||
|
|
@@ -112,7 +112,7 @@ endif()
|
||
|
|
add_definitions(${WINPR_DEFINITIONS})
|
||
|
|
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_TOOLS_LIBS})
|
||
|
|
|
||
|
|
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
|
||
|
|
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
|
||
|
|
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
|
||
|
|
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
|
||
|
|
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
|