summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-08-31 17:08:32 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2010-08-31 17:23:31 -0300
commit2a5ad3e48e5a148bc87bd6dbb74c695dd352a79a (patch)
tree19b86198ddcd6d71380e50a6dcac17cdbb3edc12
parent821885b67d27844c0ecfe9ef7b753e640e96eb6c (diff)
downloadshiboken-2a5ad3e48e5a148bc87bd6dbb74c695dd352a79a.tar.gz
shiboken-2a5ad3e48e5a148bc87bd6dbb74c695dd352a79a.tar.xz
shiboken-2a5ad3e48e5a148bc87bd6dbb74c695dd352a79a.zip
Use the correct path separator on Windows.
-rw-r--r--CMakeLists.txt6
-rw-r--r--tests/otherbinding/CMakeLists.txt4
2 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da048567..6d94e8b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,12 @@ else()
endif()
endif()
+if (WIN32)
+ set(PATH_SEP "\;")
+else()
+ set(PATH_SEP ":")
+endif()
+
if(WIN32 OR AVOID_PROTECTED_HACK)
message(STATUS "Avoiding protected hack!")
add_definitions("-DAVOID_PROTECTED_HACK")
diff --git a/tests/otherbinding/CMakeLists.txt b/tests/otherbinding/CMakeLists.txt
index 6ec70700..0864d961 100644
--- a/tests/otherbinding/CMakeLists.txt
+++ b/tests/otherbinding/CMakeLists.txt
@@ -18,8 +18,8 @@ find_program(GENERATOR generatorrunner REQUIRED)
add_custom_command(OUTPUT ${other_SRC}
COMMAND ${GENERATOR} --generatorSet=${shiboken_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX} --enable-parent-ctor-heuristic
${CMAKE_CURRENT_SOURCE_DIR}/global.h
- --include-paths=${libother_SOURCE_DIR}:${libsample_SOURCE_DIR}:${libsample_SOURCE_DIR}/..
- --typesystem-paths=${CMAKE_CURRENT_SOURCE_DIR}:${sample_SOURCE_DIR}
+ --include-paths=${libother_SOURCE_DIR}${PATH_SEP}${libsample_SOURCE_DIR}${PATH_SEP}${libsample_SOURCE_DIR}/..
+ --typesystem-paths=${CMAKE_CURRENT_SOURCE_DIR}${PATH_SEP}${sample_SOURCE_DIR}
--output-directory=${CMAKE_CURRENT_BINARY_DIR}
${other_TYPESYSTEM}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}