]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix: We need different delimeters for Windows and CYGWIN. *sigh*
authorMatthias Maier <tamiko@kyomu.43-1.org>
Sun, 3 Nov 2013 00:10:13 +0000 (00:10 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Sun, 3 Nov 2013 00:10:13 +0000 (00:10 +0000)
git-svn-id: https://svn.dealii.org/trunk@31522 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_deal_ii_invoke_autopilot.cmake

index 8581f75f3219a9a688cf93734c67cc4021862731..38c93daec99935b3a8f7bfe75fe261f4b70cd6bd 100644 (file)
@@ -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"

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.