zorba-coders team mailing list archive

[Juan Zacarias <juan457@xxxxxxxxx>]

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/zorba-bug1006311 into lp:zorba.

Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1006311 in Zorba: "jvm.dll not found under Windows when using util-jvm"
  https://bugs.launchpad.net/zorba/+bug/1006311

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-bug1006311/+merge/118648
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-bug1006311/+merge/118648
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
--- cmake_modules/Windows/ProxyFindModule.cmake	2012-07-24 08:48:48 +0000
+++ cmake_modules/Windows/ProxyFindModule.cmake	2012-08-07 23:15:25 +0000
@@ -265,13 +265,15 @@
   IF (NOT WIN32)
     MESSAGE (FATAL_ERROR "This macro is intended only for Windows platforms.")
   ENDIF (NOT WIN32)
-
+  
+  PARSE_ARGUMENTS(ARG "" "" "SKIP_INSTALL" ${ARGN})
+  
   # get the current DLLs and their paths
   SET (dlls "${ZORBA_REQUIRED_DLLS}")
   SET (paths "${ZORBA_REQUIRED_DLL_PATHS}")
-
-  FOREACH (NAME ${ARGN})
-
+  
+  FOREACH (NAME ${ARG_DEFAULT_ARGS})
+  
     # first delete the cache entry used during FIND_FILE to make sure the correct file is chosen
     UNSET (TMP_DLL_VAR CACHE)
 
@@ -291,8 +293,13 @@
       FILE (TO_NATIVE_PATH ${PATH} NATIVE_PATH)
       LIST (APPEND paths "${NATIVE_PATH}")
       MESSAGE (STATUS "Added dll to ZORBA_REQUIRED_DLLS cache variable: ${TMP_DLL_VAR}")
-      INSTALL_DLL (${TMP_DLL_VAR})
-
+      
+      IF(ARG_SKIP_INSTALL)
+        MESSAGE(STATUS "Skip installation of ${NAME}.dll")
+      ELSE (ARG_SKIP_INSTALL)
+        INSTALL_DLL (${TMP_DLL_VAR})
+      ENDIF(ARG_SKIP_INSTALL)
+      
       # we break the loop if we found one DLL
       BREAK ()
 
@@ -302,7 +309,7 @@
 
   # we report a warning if the DLL could not be found
   IF (NOT TMP_DLL_VAR)
-    MESSAGE (WARNING "None of the names provided (${ARGN}) points to a DLL in: ${LIBRARY_LOCATION}. Zorba will not run properly unless you have it in the path.")
+    MESSAGE (WARNING "None of the names provided (${ARG_DEFAULT_ARGS}) points to a DLL in: ${LIBRARY_LOCATION}. Zorba will not run properly unless you have it in the path.")
   ENDIF (NOT TMP_DLL_VAR)
 
   # make sure we don't leave garbage in the cache and don't influence other logic with this