summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-02 17:07:17 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-02 17:07:17 (GMT)
commit55f2a3d62754001fe44209f513ed81f90dab9338 (patch)
tree00e0bc3541a36225747c45c93a16b4774f7f2a04
parentfa894c30037a5de1ce5037bfa1b418d53249b4c8 (diff)
parent5d3b0bb501aec34e452ddd1b140b90699d929621 (diff)
downloadCMake-55f2a3d62754001fe44209f513ed81f90dab9338.zip
CMake-55f2a3d62754001fe44209f513ed81f90dab9338.tar.gz
CMake-55f2a3d62754001fe44209f513ed81f90dab9338.tar.bz2
Merge topic 'FindSWIG-3498'
5d3b0bb FindSWIG: allow to provide SWIG_DIR (#3498)
-rw-r--r--Modules/FindSWIG.cmake2
1 files changed, 0 insertions, 2 deletions
diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index 55f4c0d..8bd4048 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -52,8 +52,6 @@ if(SWIG_EXECUTABLE)
endif()
else()
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)
if(SWIG_DIR)
set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)