Changeset View
Changeset View
Standalone View
Standalone View
head/net/freerdp1/files/patch-client_X11_CMakeLists.txt
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- client/X11/CMakeLists.txt.orig 2016-12-04 14:35:40 UTC | |||||
+++ client/X11/CMakeLists.txt | |||||
@@ -16,7 +16,7 @@ | |||||
# See the License for the specific language governing permissions and | |||||
# limitations under the License. | |||||
-set(MODULE_NAME "xfreerdp-client") | |||||
+set(MODULE_NAME "xfreerdp1-client") | |||||
set(MODULE_PREFIX "FREERDP_CLIENT_X11_CONTROL") | |||||
include(FindDocBookXSL) | |||||
@@ -66,7 +66,7 @@ if(WITH_CLIENT_INTERFACE) | |||||
else() | |||||
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/xfreerdp.h) | |||||
add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) | |||||
- set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp") | |||||
+ set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp1") | |||||
endif() | |||||
set(${MODULE_PREFIX}_LIBS | |||||
@@ -84,31 +84,31 @@ if(WITH_MANPAGES) | |||||
TODAY(MAN_TODAY) | |||||
- configure_file(xfreerdp.1.xml.in xfreerdp.1.xml @ONLY IMMEDIATE) | |||||
+ configure_file(xfreerdp.1.xml.in xfreerdp1.1.xml @ONLY IMMEDIATE) | |||||
add_executable(generate_argument_docbook generate_argument_docbook.c) | |||||
- set(GAD_LIBS freerdp-client) | |||||
- target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp winpr) | |||||
+ set(GAD_LIBS freerdp1-client) | |||||
+ target_link_libraries(generate_argument_docbook ${GAD_LIBS} freerdp1 winpr1) | |||||
- add_custom_command(OUTPUT xfreerdp.1 | |||||
+ add_custom_command(OUTPUT xfreerdp1.1 | |||||
COMMAND generate_argument_docbook | |||||
COMMAND ${CMAKE_COMMAND} -E copy | |||||
${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml ${CMAKE_CURRENT_BINARY_DIR} | |||||
COMMAND ${CMAKE_COMMAND} -E copy | |||||
${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml ${CMAKE_CURRENT_BINARY_DIR} | |||||
- COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp.1.xml | |||||
+ COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp1.1.xml | |||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} | |||||
DEPENDS | |||||
- ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1.xml | |||||
+ ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1.xml | |||||
${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml | |||||
${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml | |||||
generate_argument_docbook) | |||||
- add_custom_target(xfreerdp.manpage ALL | |||||
- DEPENDS xfreerdp.1) | |||||
+ add_custom_target(xfreerdp1.manpage ALL | |||||
+ DEPENDS xfreerdp1.1) | |||||
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION share/man/man1) | |||||
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp1.1 DESTINATION man/man1) | |||||
else() | |||||
message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed") | |||||
endif() | |||||
@@ -199,7 +199,7 @@ endif() | |||||
include_directories(${CMAKE_SOURCE_DIR}/resources) | |||||
-set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp freerdp-client) | |||||
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp1 freerdp1-client) | |||||
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) | |||||
if(WITH_IPP) |