Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mattias Ellert
CMake
Commits
229dd421
Commit
229dd421
authored
3 years ago
by
Seth R Johnson
Browse files
Options
Downloads
Patches
Plain Diff
Change find_path scope and add quotes
parent
ff6f7b23
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/FindSWIG.cmake
+8
-8
8 additions, 8 deletions
Modules/FindSWIG.cmake
with
8 additions
and
8 deletions
Modules/FindSWIG.cmake
+
8
−
8
View file @
229dd421
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment