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