From 9b371bedff4c4aae4b8a3cab66d7bd67632155cb Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 28 Jul 2013 15:45:07 -0700 Subject: gras: added more vars to gras tools --- cmake/Modules/GRASTool.in.cmake | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'cmake') 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 @@ -3,6 +3,17 @@ if(DEFINED __INCLUDED_GRAS_TOOL_CMAKE) 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() -- cgit