zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/cmake-semi-colon-windows into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/cmake-semi-colon-windows/+merge/106380

Escaped a semi-colon in CMake file because they have a special meaning in CMake.
-- 
https://code.launchpad.net/~zorba-coders/zorba/cmake-semi-colon-windows/+merge/106380
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2012-05-03 12:31:51 +0000
+++ bin/CMakeLists.txt	2012-05-18 13:55:26 +0000
@@ -112,12 +112,12 @@
   PASS_REGULAR_EXPRESSION "hello, v2")
 
 IF(WIN32)
-  SET(PATH_SEP ";")
+  ZORBA_ADD_TEST(bin/zorba_module_path_1 zorbacmd -f -q "${_testdir}/external1.xq"
+    --module-path "${_libdir}\;${_uridir}")
 ELSE(WIN32)
-  SET(PATH_SEP ":")
+  ZORBA_ADD_TEST(bin/zorba_module_path_1 zorbacmd -f -q "${_testdir}/external1.xq"
+    --module-path "${_libdir}:${_uridir}")
 ENDIF(WIN32)
-ZORBA_ADD_TEST(bin/zorba_module_path_1 zorbacmd -f -q "${_testdir}/external1.xq"
-  --module-path "${_libdir}${PATH_SEP}${_uridir}")
 ZORBA_SET_TEST_PROPERTY(bin/zorba_module_path_1
   PASS_REGULAR_EXPRESSION "hello, v2")