zorba-coders team mailing list archive

[Gabriel Petrovay <gabriel.petrovay@xxxxxxxxxx>]

Gabriel Petrovay has proposed merging lp:~gabipetrovay/zorba/proxy into lp:zorba.

Requested reviews:
  Juan Zacarias (juan457)

For more details, see:
https://code.launchpad.net/~gabipetrovay/zorba/proxy/+merge/78227

Fixing availability of external module DLL's in the PATH when running CTest.

ZORBA_REQUIRED_DLL is only used now to generate the scripts and not to INSTALL the DLL's themselves. For this the proxy module is used when each DLL is found.
-- 
https://code.launchpad.net/~gabipetrovay/zorba/proxy/+merge/78227
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'WIN32.cpack'
--- WIN32.cpack	2011-07-29 23:50:20 +0000
+++ WIN32.cpack	2011-10-05 10:17:25 +0000
@@ -14,5 +14,3 @@
 #
 
 INCLUDE(InstallRequiredSystemLibraries)
-
-INSTALL(PROGRAMS ${ZORBA_REQUIRED_DLLS} DESTINATION bin)

=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
--- cmake_modules/Windows/ProxyFindModule.cmake	2011-09-26 12:50:56 +0000
+++ cmake_modules/Windows/ProxyFindModule.cmake	2011-10-05 10:17:25 +0000
@@ -272,15 +272,13 @@
   # make sure we don't leave garbage in the cache and don't influence other logic with this
   SET (TMP_DLL_VAR TMP_DLL_VAR-NOTFOUND CACHE FILEPATH "Path to a file." FORCE)
 
-  IF (${PROJECT_NAME} STREQUAL  "zorba")
-    # set the current DLLs and their paths in a variable
-    SET (ZORBA_REQUIRED_DLLS "${dlls}"
-      CACHE STRING "List of DLLs that must be installed" FORCE
-    )
-    SET (ZORBA_REQUIRED_DLL_PATHS "${paths}"
-      CACHE STRING "List of paths executable require in order to find the required DLLs" FORCE
-    )
-  ENDIF (${PROJECT_NAME} STREQUAL  "zorba")
+  # set the current DLLs and their paths in a variable
+  SET (ZORBA_REQUIRED_DLLS "${dlls}"
+    CACHE STRING "List of DLLs that must be installed" FORCE
+  )
+  SET (ZORBA_REQUIRED_DLL_PATHS "${paths}"
+    CACHE STRING "List of paths executable require in order to find the required DLLs" FORCE
+  )
 
 ENDMACRO (FIND_PACKAGE_DLL_WIN32)
 
@@ -339,15 +337,13 @@
   # make sure we don't leave garbage in the cache and don't influence other logic with this
   SET (TMP_DLL_VAR TMP_DLL_VAR-NOTFOUND CACHE FILEPATH "Path to a file." FORCE)
 
-  IF (${PROJECT_NAME} STREQUAL  "zorba")
-    # set the current DLLs and their paths in a variable
-    SET (ZORBA_REQUIRED_DLLS "${dlls}"
-      CACHE STRING "List of DLLs that must be installed" FORCE
-    )
-    SET (ZORBA_REQUIRED_DLL_PATHS "${paths}"
-      CACHE STRING "List of paths executable require in order to find the required DLLs" FORCE
-    )
-  ENDIF (${PROJECT_NAME} STREQUAL  "zorba")
+  # set the current DLLs and their paths in a variable
+  SET (ZORBA_REQUIRED_DLLS "${dlls}"
+    CACHE STRING "List of DLLs that must be installed" FORCE
+  )
+  SET (ZORBA_REQUIRED_DLL_PATHS "${paths}"
+    CACHE STRING "List of paths executable require in order to find the required DLLs" FORCE
+  )
 
 ENDMACRO (FIND_PACKAGE_DLLS_WIN32)