Merge topic 'FindSWIG-3498'

5d3b0bb FindSWIG: allow to provide SWIG_DIR (#3498)
This commit is contained in:
Brad King 2013-12-02 12:07:17 -05:00 committed by CMake Topic Stage
commit 55f2a3d627
1 changed files with 0 additions and 2 deletions

View File

@ -52,8 +52,6 @@ if(SWIG_EXECUTABLE)
endif() endif()
else() else()
string(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output}) string(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output})
# force the path to be computed each time in case SWIG_EXECUTABLE has changed.
set(SWIG_DIR SWIG_DIR-NOTFOUND)
find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output} NO_CMAKE_FIND_ROOT_PATH) find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output} NO_CMAKE_FIND_ROOT_PATH)
if(SWIG_DIR) if(SWIG_DIR)
set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake) set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)