diff options
| author | Josh Blum | 2013-07-28 15:45:07 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-07-28 15:45:07 -0700 |
| commit | 9b371bedff4c4aae4b8a3cab66d7bd67632155cb (patch) | |
| tree | ddf986993a19410ada3ff669a6d8d460b13a328c /cmake | |
| parent | b1815c83dcd92a04e5091a08c7d76b98ed73ee7a (diff) | |
| download | sandhi-9b371bedff4c4aae4b8a3cab66d7bd67632155cb.tar.gz sandhi-9b371bedff4c4aae4b8a3cab66d7bd67632155cb.tar.bz2 sandhi-9b371bedff4c4aae4b8a3cab66d7bd67632155cb.zip | |
gras: added more vars to gras tools
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GRASTool.in.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/cmake/Modules/GRASTool.in.cmake b/cmake/Modules/GRASTool.in.cmake index 5991b03..ce729c1 100644 --- a/cmake/Modules/GRASTool.in.cmake +++ b/cmake/Modules/GRASTool.in.cmake @@ -4,6 +4,17 @@ endif() set(__INCLUDED_GRAS_TOOL_CMAKE TRUE) ######################################################################## +## Define GRAS_TOOL_PATH_SEP for utility purposes +######################################################################## +if(UNIX) + set(GRAS_TOOL_PATH_SEP ":") +elseif(WIN32) + set(GRAS_TOOL_PATH_SEP "\\;") +else() + set(GRAS_TOOL_PATH_SEP ":") +endif() + +######################################################################## ## Set installation constants ## The GRAS_ROOT can be set via arg or environment variable ######################################################################## @@ -137,7 +148,7 @@ function(GRAS_TOOL) ) get_target_property(module_location ${GRAS_TOOL_TARGET} LOCATION) - string(REPLACE "$(Configuration)" ${CMAKE_BUILD_TYPE} module_location ${module_location}) + string(REGEX REPLACE "\\$\\(.*\\)" ${CMAKE_BUILD_TYPE} module_location ${module_location}) set(${GRAS_TOOL_TARGET}_LOCATION ${module_location} PARENT_SCOPE) endif() |