108 lines
5.1 KiB
Diff
108 lines
5.1 KiB
Diff
|
diff -up kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake
|
||
|
|
--- kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-11-20 16:28:26.945612607 -0600
|
||
|
|
+++ kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake 2010-11-20 18:18:01.926613935 -0600
|
||
|
|
@@ -1042,7 +1042,7 @@ if (UNIX)
|
||
|
|
|
||
|
|
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||
|
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||
|
|
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||
|
|
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
|
||
|
|
endif (APPLE)
|
||
|
|
endif (UNIX)
|
||
|
|
|
||
|
|
diff -up kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath kdelibs-4.5.80/kdewidgets/CMakeLists.txt
|
||
|
|
--- kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath 2010-11-20 16:28:26.784363550 -0600
|
||
|
|
+++ kdelibs-4.5.80/kdewidgets/CMakeLists.txt 2010-11-20 18:20:09.111363760 -0600
|
||
|
|
@@ -46,14 +46,14 @@ if(QT_QTDESIGNER_FOUND)
|
||
|
|
kde4_add_plugin(kdewidgets ${kdewidgets_PART_SRCS})
|
||
|
|
|
||
|
|
target_link_libraries(kdewidgets ${KDE4_KIO_LIBS})
|
||
|
|
- if(NOT WIN32)
|
||
|
|
- set_target_properties(kdewidgets PROPERTIES
|
||
|
|
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
- SKIP_BUILD_RPATH TRUE
|
||
|
|
- BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
- )
|
||
|
|
- endif(NOT WIN32)
|
||
|
|
+# if(NOT WIN32)
|
||
|
|
+# set_target_properties(kdewidgets PROPERTIES
|
||
|
|
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
+# SKIP_BUILD_RPATH TRUE
|
||
|
|
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
+# )
|
||
|
|
+# endif(NOT WIN32)
|
||
|
|
|
||
|
|
install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||
|
|
|
||
|
|
@@ -76,14 +76,14 @@ if(QT_QTDESIGNER_FOUND)
|
||
|
|
kde4_add_plugin(kdedeprecated ${kdedeprecated_PART_SRCS})
|
||
|
|
|
||
|
|
target_link_libraries(kdedeprecated ${KDE4_KIO_LIBS})
|
||
|
|
- if(NOT WIN32)
|
||
|
|
- set_target_properties(kdedeprecated PROPERTIES
|
||
|
|
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
- SKIP_BUILD_RPATH TRUE
|
||
|
|
- BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
- )
|
||
|
|
- endif(NOT WIN32)
|
||
|
|
+# if(NOT WIN32)
|
||
|
|
+# set_target_properties(kdedeprecated PROPERTIES
|
||
|
|
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
+# SKIP_BUILD_RPATH TRUE
|
||
|
|
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
+# )
|
||
|
|
+# endif(NOT WIN32)
|
||
|
|
|
||
|
|
install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||
|
|
endif(NOT KDE_NO_DEPRECATED)
|
||
|
|
@@ -111,14 +111,14 @@ if(QT_QTDESIGNER_FOUND)
|
||
|
|
kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
|
||
|
|
|
||
|
|
target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
|
||
|
|
- if(NOT WIN32)
|
||
|
|
- set_target_properties(kdewebkitwidgets PROPERTIES
|
||
|
|
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
- SKIP_BUILD_RPATH TRUE
|
||
|
|
- BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
- )
|
||
|
|
- endif(NOT WIN32)
|
||
|
|
+# if(NOT WIN32)
|
||
|
|
+# set_target_properties(kdewebkitwidgets PROPERTIES
|
||
|
|
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
+# SKIP_BUILD_RPATH TRUE
|
||
|
|
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
+# )
|
||
|
|
+# endif(NOT WIN32)
|
||
|
|
|
||
|
|
install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||
|
|
|
||
|
|
@@ -147,14 +147,14 @@ if(QT_QTDESIGNER_FOUND)
|
||
|
|
kde4_add_plugin(kde3supportwidgets ${kde3supportwidgets_PART_SRCS})
|
||
|
|
|
||
|
|
target_link_libraries(kde3supportwidgets ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS})
|
||
|
|
- if(NOT WIN32)
|
||
|
|
- set_target_properties(kde3supportwidgets PROPERTIES
|
||
|
|
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
- SKIP_BUILD_RPATH TRUE
|
||
|
|
- BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
- )
|
||
|
|
- endif(NOT WIN32)
|
||
|
|
+# if(NOT WIN32)
|
||
|
|
+# set_target_properties(kde3supportwidgets PROPERTIES
|
||
|
|
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||
|
|
+# SKIP_BUILD_RPATH TRUE
|
||
|
|
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||
|
|
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||
|
|
+# )
|
||
|
|
+# endif(NOT WIN32)
|
||
|
|
|
||
|
|
install(TARGETS kde3supportwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||
|
|
endif (QT_QT3SUPPORT_FOUND)
|