From bbaceb75e245ec9082149bfd178cc21e1b24054f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 4 Sep 2011 19:45:57 -0400 Subject: [PATCH 1/2] client/X11: Install man page from the build dir Fixes installation from out-of-tree builds. --- client/X11/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index 5669f1090..6e5e99fbd 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -45,7 +45,7 @@ if(WITH_MANPAGES) add_custom_target(xfreerdp.manpage ALL DEPENDS xfreerdp.1) - install(FILES xfreerdp.1 DESTINATION share/man/man1) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION share/man/man1) else(XMLTO_FOUND) message(WARNING "WITH_MANPAGES was set, but xmlto was not found. man-pages will not be installed") endif(XMLTO_FOUND) From a9fe22921a8189c63d5a67c5c96918f38f26c582 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 4 Sep 2011 21:41:52 -0400 Subject: [PATCH 2/2] CMakeLists.txt: Call enable_testing before processing cunit subdirectory Otherwise, add_test does nothing. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1380dae90..6fd61a0a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,8 +118,8 @@ endif() # Build CUnit find_optional_package(CUnit) if(CUNIT_FOUND) - add_subdirectory(cunit) enable_testing() + add_subdirectory(cunit) endif() # Sub-directories