Permalink
Browse files

Merge topic '13054_fix_processxml'

15a314b BUG #13054. 0013054: Build kwProcessXML as forwarded executable always.
  • Loading branch information...
2 parents 75d3135 + 15a314b commit c8d4afb18308649c9d15b44147fe60e2e70d8558 @utkarshayachit utkarshayachit committed with kwrobot Apr 20, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 Common/KWCommon/CMakeLists.txt
@@ -225,7 +225,7 @@ SET(Temp_Using_Shared_Forwarding OFF)
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 @@ IF(KWCOMMON_BUILD_PROCESSXML)
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)

0 comments on commit c8d4afb

Please sign in to comment.