diff options
Diffstat (limited to 'x11/kde4-workspace/files/patch-CMakeLists.txt')
| -rw-r--r-- | x11/kde4-workspace/files/patch-CMakeLists.txt | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt index 6fea1f815c21..24b0b4d2b235 100644 --- a/x11/kde4-workspace/files/patch-CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- ./CMakeLists.txt.orig 2010-07-29 01:04:56.000000000 +0400 -+++ ./CMakeLists.txt 2010-08-03 14:45:37.785806201 +0400 -@@ -84,7 +84,7 @@ +--- ./CMakeLists.txt.orig 2011-07-19 23:37:36.000000000 +0200 ++++ ./CMakeLists.txt 2011-08-09 20:45:40.975563521 +0200 +@@ -90,7 +90,7 @@ configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h ) if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") @@ -9,19 +9,3 @@ endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) endif(NOT WIN32) -@@ -223,13 +223,13 @@ - macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake - ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH}) - --set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake) -+set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake) - # places where find_package() looks for FooConfig.cmake files: - # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in - # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR - # option to have kdepimlibs install its Config file there. Alex - if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) -- set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} ) -+ set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace ) - endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake |