Skip to content

Commit

Permalink
BUG: Fix installed cswig reference to SWIGLib
Browse files Browse the repository at this point in the history
The SWIG_LIB_INSTALL value must be set before the configure_file command
for "swigconfig.h".  The old code worked only in old CMake versions that
delayed configuration to the end.  This fix allows an installed cswig to
locate its installed swig library.
  • Loading branch information
bradking committed May 20, 2009
1 parent 56a926d commit a15d71d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion GCC_XML/KWSys/kwsysDateStamp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2009)
SET(KWSYS_DATE_STAMP_MONTH 05)

# KWSys version date day component. Format is DD.
SET(KWSYS_DATE_STAMP_DAY 19)
SET(KWSYS_DATE_STAMP_DAY 20)
5 changes: 3 additions & 2 deletions SWIG/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ SET(SWIG_LIB "\"${SWIG_SOURCE_DIR}/Lib\"")
SET(SWIG_CXX "\"${CMAKE_CXX_COMPILER}\"")
SET(SWIG_PLATFORM "\"${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}\"")

SET(SWIG_LIB_INSTALL
${CMAKE_INSTALL_PREFIX}/${CableSwig_INSTALL_ROOT}lib/CableSwig/SWIGLib)

INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)

Expand Down Expand Up @@ -159,6 +162,4 @@ CONFIGURE_FILE(${SWIG_SOURCE_DIR}/SWIGConfig.cmake.in
${SWIG_BINARY_DIR}/SWIGConfig.cmake @ONLY IMMEDIATE)

# Install support library.
SET(SWIG_LIB_INSTALL
${CMAKE_INSTALL_PREFIX}/${CableSwig_INSTALL_ROOT}lib/CableSwig/SWIGLib)
SUBDIRS(Lib)

0 comments on commit a15d71d

Please sign in to comment.