Commit 229dd421 authored by Seth R Johnson's avatar Seth R Johnson
Browse files

Change find_path scope and add quotes

parent ff6f7b23
...@@ -91,7 +91,7 @@ unset(_SWIG_NAMES) ...@@ -91,7 +91,7 @@ unset(_SWIG_NAMES)
if(SWIG_EXECUTABLE AND NOT SWIG_DIR) if(SWIG_EXECUTABLE AND NOT SWIG_DIR)
# Find default value for SWIG library directory # Find default value for SWIG library directory
execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib execute_process(COMMAND "${SWIG_EXECUTABLE}" -swiglib
OUTPUT_VARIABLE _swig_output OUTPUT_VARIABLE _swig_output
ERROR_VARIABLE _swig_error ERROR_VARIABLE _swig_error
RESULT_VARIABLE _swig_result) RESULT_VARIABLE _swig_result)
...@@ -105,17 +105,17 @@ if(SWIG_EXECUTABLE AND NOT SWIG_DIR) ...@@ -105,17 +105,17 @@ if(SWIG_EXECUTABLE AND NOT SWIG_DIR)
endif() endif()
unset(_msg) unset(_msg)
else() else()
string(REGEX REPLACE "[\n\r]+" ";" _SWIGLIB ${_swig_output}) string(REGEX REPLACE "[\n\r]+" ";" _SWIG_LIB ${_swig_output})
endif() endif()
endif()
# Find SWIG library directory # Find SWIG library directory
find_path(SWIG_DIR swig.swg PATHS ${_SWIGLIB} NO_CMAKE_FIND_ROOT_PATH) find_path(SWIG_DIR swig.swg PATHS ${_SWIG_LIB} NO_CMAKE_FIND_ROOT_PATH)
unset(_SWIGLIB) unset(_SWIG_LIB)
endif()
if(SWIG_EXECUTABLE AND SWIG_DIR AND NOT SWIG_VERSION) if(SWIG_EXECUTABLE AND SWIG_DIR AND NOT SWIG_VERSION)
# Determine SWIG version # Determine SWIG version
execute_process(COMMAND ${SWIG_EXECUTABLE} -version execute_process(COMMAND "${SWIG_EXECUTABLE}" -version
OUTPUT_VARIABLE _swig_output OUTPUT_VARIABLE _swig_output
ERROR_VARIABLE _swig_output ERROR_VARIABLE _swig_output
RESULT_VARIABLE _swig_result) RESULT_VARIABLE _swig_result)
...@@ -129,7 +129,7 @@ if(SWIG_EXECUTABLE AND SWIG_DIR AND NOT SWIG_VERSION) ...@@ -129,7 +129,7 @@ if(SWIG_EXECUTABLE AND SWIG_DIR AND NOT SWIG_VERSION)
endif() endif()
if(SWIG_EXECUTABLE AND SWIG_FIND_COMPONENTS) if(SWIG_EXECUTABLE AND SWIG_FIND_COMPONENTS)
execute_process(COMMAND ${SWIG_EXECUTABLE} -help execute_process(COMMAND "${SWIG_EXECUTABLE}" -help
OUTPUT_VARIABLE _swig_output OUTPUT_VARIABLE _swig_output
ERROR_VARIABLE _swig_error ERROR_VARIABLE _swig_error
RESULT_VARIABLE _swig_result) RESULT_VARIABLE _swig_result)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment