Merge topic 'FindSWIG-fix13771'
8c127c9 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)
This commit is contained in:
commit
f1d5d88911
@ -56,7 +56,7 @@ if(SWIG_EXECUTABLE)
|
|||||||
set(SWIG_DIR SWIG_DIR-NOTFOUND)
|
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_ROOT}/Modules/UseSWIG.cmake)
|
set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)
|
||||||
execute_process(COMMAND ${SWIG_EXECUTABLE} -version
|
execute_process(COMMAND ${SWIG_EXECUTABLE} -version
|
||||||
OUTPUT_VARIABLE SWIG_version_output
|
OUTPUT_VARIABLE SWIG_version_output
|
||||||
ERROR_VARIABLE SWIG_version_output
|
ERROR_VARIABLE SWIG_version_output
|
||||||
|
Loading…
x
Reference in New Issue
Block a user