From aba6d7c340fc99e71a097efa9a432f367a0b7f6f Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 3 Nov 2013 00:10:13 +0000 Subject: [PATCH] Bugfix: We need different delimeters for Windows and CYGWIN. *sigh* git-svn-id: https://svn.dealii.org/trunk@31522 0785d39b-7218-0410-832d-ea1e28bc413d --- .../cmake/macros/macro_deal_ii_invoke_autopilot.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake b/deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake index 8581f75f32..38c93daec9 100644 --- a/deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake @@ -50,14 +50,17 @@ MACRO(DEAL_II_INVOKE_AUTOPILOT) SET(TARGET_RUN ${TARGET}) ENDIF() - IF( CMAKE_SYSTEM_NAME MATCHES "CYGWIN" - OR CMAKE_SYSTEM_NAME MATCHES "Windows" ) + IF(CMAKE_SYSTEM_NAME MATCHES "(CYGWIN|Windows)") # # Hack for Cygwin and Windows targets: Export PATH to point to the # dynamic library. # + SET(_delim ":") + IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(_delim ";") + ENDIF() FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/run_target.cmake - "SET(ENV{PATH} \"${CMAKE_CURRENT_BINARY_DIR};${DEAL_II_PATH}/${DEAL_II_EXECUTABLE_RELDIR};\$ENV{PATH}\")\n" + "SET(ENV{PATH} \"${CMAKE_CURRENT_BINARY_DIR}${_delim}${DEAL_II_PATH}/${DEAL_II_EXECUTABLE_RELDIR}${_delim}\$ENV{PATH}\")\n" "EXECUTE_PROCESS(COMMAND ${TARGET_RUN}\n" " RESULT_VARIABLE _return_value\n" " )\n" -- 2.39.5