projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e59de90 TL |
1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | index 97ba2f9..64a2f33 100644 | |
| 3 | --- a/CMakeLists.txt | |
| 4 | +++ b/CMakeLists.txt | |
| 5 | @@ -107,7 +107,7 @@ else() | |
| 6 | endif() | |
| 7 | message("FREERDP_VERSION=${FREERDP_VERSION_FULL}") | |
| 8 | ||
| 9 | -set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/") | |
| 10 | +set(FREERDP_INCLUDE_DIR "include/") | |
| 11 | ||
| 12 | # Compatibility options | |
| 13 | if(DEFINED STATIC_CHANNELS) | |
| 14 | diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt | |
| 15 | index a020dc5..0bc1157 100644 | |
| 16 | --- a/include/CMakeLists.txt | |
| 17 | +++ b/include/CMakeLists.txt | |
| 18 | @@ -19,7 +19,7 @@ | |
| 19 | ||
| 20 | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h) | |
| 21 | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h) | |
| 22 | -set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp) | |
| 23 | +set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp) | |
| 24 | ||
| 25 | file(GLOB FREERDP_HEADERS "freerdp/*.h") | |
| 26 | install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers) | |
| 27 | diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt | |
| 28 | index a94090a..08b6b88 100644 | |
| 29 | --- a/winpr/CMakeLists.txt | |
| 30 | +++ b/winpr/CMakeLists.txt | |
| 31 | @@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") | |
| 32 | ||
| 33 | SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}") | |
| 34 | ||
| 35 | - set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}") | |
| 36 | + set(WINPR_INCLUDE_DIR "include") | |
| 37 | ||
| 38 | configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake | |
| 39 | INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR} | |
| 40 | diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt | |
| 41 | index 452383d..3faab0c 100644 | |
| 42 | --- a/winpr/include/CMakeLists.txt | |
| 43 | +++ b/winpr/include/CMakeLists.txt | |
| 44 | @@ -17,7 +17,7 @@ | |
| 45 | ||
| 46 | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h) | |
| 47 | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h) | |
| 48 | -set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr) | |
| 49 | +set(WINPR_INSTALL_INCLUDE_DIR include/winpr) | |
| 50 | ||
| 51 | file(GLOB WINPR_HEADERS "winpr/*.h") | |
| 52 | install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers) |