[Plplot-cvs] SF.net SVN: plplot:[12466] trunk/cmake/build_projects/plplot/bp.cmake

[<ai...@us...>]

Revision: 12466
          http://sourceforge.net/p/plplot/code/12466
Author:   airwin
Date:     2013-08-03 17:39:54 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Do not reuse PLPLOT_LOCAL_SOURCE_DIR in loop that configures both
plplot and plplot_lite.  This fixes a bug where
z: was being prepended twice for the second time through the loop.

Modified Paths:
--------------
    trunk/cmake/build_projects/plplot/bp.cmake

Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake	2013-08-03 17:35:12 UTC (rev 12465)
+++ trunk/cmake/build_projects/plplot/bp.cmake	2013-08-03 17:39:54 UTC (rev 12466)
@@ -100,7 +100,9 @@
     # TEMPORARY (already in the _required_ native form for the cmake -E
     # copy_directory command below except for the drive letter which is
     # z: for this local result.)
-    set(PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
+    set(MODIFIED_PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
+  else(MSYS_PLATFORM)
+    set(MODIFIED_PLPLOT_LOCAL_SOURCE_DIR ${PLPLOT_LOCAL_SOURCE_DIR})
   endif(MSYS_PLATFORM)
   message(STATUS "modified BP_PATH for ${BP_PACKAGE}${tag} = ${BP_PATH}")
 
@@ -110,7 +112,7 @@
     build_${BP_PACKAGE}${tag}
     DEPENDS "${${BP_PACKAGE}${tag}_dependencies_targets}"
     #TEMPORARY
-    DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+    DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${MODIFIED_PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
     CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
     BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
     INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.