From c5624ce58f08fa61d9b540b299c030adaf4bf00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 14 Aug 2012 19:55:48 -0400 Subject: [PATCH] include: fix installation of headers --- CMakeLists.txt | 1 - include/CMakeLists.txt | 20 ++++++++------------ libfreerdp/CMakeLists.txt | 2 ++ winpr/CMakeLists.txt | 2 ++ winpr/include/CMakeLists.txt | 5 ++--- winpr/libwinpr/CMakeLists.txt | 3 ++- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed9426003..f70e465ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,4 +239,3 @@ string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_lower) set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME_lower}-${FREERDP_VERSION_FULL}") include(CPack) - diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index f592d95d9..745aaaf67 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -17,20 +17,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -file(GLOB HEADERS "freerdp/*.h") -install(FILES ${HEADERS} DESTINATION include/freerdp) +file(GLOB FREERDP_HEADERS "freerdp/*.h") +install(FILES ${FREERDP_HEADERS} DESTINATION include/freerdp) -install(DIRECTORY freerdp/utils DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/channels DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/cache DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/gdi DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/rail DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/channels DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/codec DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/plugins DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/locale DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/crypto DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/auth DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/gdi DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/locale DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/plugins DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/rail DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") install(DIRECTORY freerdp/server DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") - -file(GLOB HEADERS "winpr/*.h") -install(FILES ${HEADERS} DESTINATION include/winpr) +install(DIRECTORY freerdp/utils DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h") diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index 7ddefbb5e..20a46bc9b 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -42,7 +42,9 @@ if(WITH_MONOLITHIC_BUILD) $) set_target_properties(freerdp PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") + target_link_libraries(freerdp ${FREERDP_LIBS}) + install(TARGETS freerdp DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 734eb40ea..4ad76b33d 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -19,6 +19,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h) +add_subdirectory(include) + add_subdirectory(libwinpr) add_subdirectory(tools) diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt index 2d04ee5fb..fec1ede14 100644 --- a/winpr/include/CMakeLists.txt +++ b/winpr/include/CMakeLists.txt @@ -15,6 +15,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -file(GLOB HEADERS "winpr/*.h") -install(FILES ${HEADERS} DESTINATION include/winpr) - +file(GLOB WINPR_HEADERS "winpr/*.h") +install(FILES ${WINPR_HEADERS} DESTINATION include/winpr) diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt index bc6e6fbf3..c3b03afa2 100644 --- a/winpr/libwinpr/CMakeLists.txt +++ b/winpr/libwinpr/CMakeLists.txt @@ -58,7 +58,8 @@ if(WITH_MONOLITHIC_BUILD) $) set_target_properties(winpr PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") + target_link_libraries(winpr ${WINPR_LIBS}) + install(TARGETS winpr DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -