blob: b36feb6fca83a799c2081a286c5ec3f6381d08db (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
Description: This patch forces building of kwProcessXML as shared forwarded
executable in our case (even is CMAKE_SKIP_RPATH is OFF in debian)
Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Bug-Debian: http://bugs.debian.org/640305
Last-Update: 2011-09-13
--- a/Common/KWCommon/CMakeLists.txt
+++ b/Common/KWCommon/CMakeLists.txt
@@ -225,7 +225,7 @@
IF(KWCOMMON_BUILD_PROCESSXML)
# For shared libraries on non-windows systems use the KWSys shared-forward
# implementation to make sure shared libraries are found.
- IF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
+ IF(BUILD_SHARED_LIBS )
IF(NOT WIN32)
SET(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH})
SET(KWCommon_FORWARD_BIN_TO_LIB "..${KWCommon_INSTALL_LIB_DIR}")
@@ -248,7 +248,7 @@
COMPONENT Development)
ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT)
ENDIF(NOT WIN32)
- ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
+ ENDIF(BUILD_SHARED_LIBS )
ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx)
TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys)
|
