Permalink
Browse files

Merge pull request #23 from ihnorton/fix-ninja

Fix ninja build.
  • Loading branch information...
jcfr committed Jul 8, 2013
2 parents 29e0291 + 8247fa9 commit 892c95b5024a52ebd47a12292ff74ec7d713db24
Showing with 7 additions and 4 deletions.
  1. +7 −4 cmake/libpython/CMakeLists.txt
@@ -159,10 +159,12 @@ elseif(WIN32)
# HACK To workaround limitation in escaping logic of CMake, the pythonpath
# separator is conditionally set depending of the version of Visual Studio.
# See http://cmake.org/Bug/view.php?id=14073
- if("${MSVC_VERSION}" VERSION_GREATER "1599")
- set(PATHSEP "%3B")
+ if( ("${MSVC_VERSION}" VERSION_GREATER "1599") AND ("${CMAKE_GENERATOR}" MATCHES "^Visual Studio") )
+ set(PATHSEP "%3B")
+ elseif( (${MSVC}) AND ("${CMAKE_GENERATOR}" MATCHES "^Ninja") )
+ set(PATHSEP "\;")
else()
- set(PATHSEP ";")
+ set(PATHSEP ";")
endif()
list(APPEND LIBPYTHON_SOURCES
${SRC_DIR}/PC/dl_nt.c
@@ -180,11 +182,12 @@ elseif(WIN32)
if(ENABLE_TKINTER)
set(PYTHONPATH "${PYTHONPATH}${PATHSEP}.\\\\${PYTHONHOME_ESCAPED}\\\\lib-tk")
endif(ENABLE_TKINTER)
+
set_property(
SOURCE ${SRC_DIR}/PC/getpathp.c
PROPERTY COMPILE_DEFINITIONS
LANDMARK="${PYTHONHOME_ESCAPED}\\\\os.py"
- PYTHONPATH="${PYTHONPATH}"
+ "PYTHONPATH=\"${PYTHONPATH}\""
)
set_property(
SOURCE ${SRC_DIR}/PC/dl_nt.c

0 comments on commit 892c95b

Please sign in to comment.