diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d5f34d2f45f1261a9e5db83b227a3ac218abe42..c342e270cdbf091f67ca403443ad4792a7009dc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ ENDIF() # SWIG FIND_PACKAGE(SWIG REQUIRED) IF(CMAKE_GENERATOR MATCHES "Visual Studio") # not MSVC because of nmake & jom - SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/") + SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}/$(Configuration)/") ELSE() SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}") ENDIF() @@ -108,6 +108,7 @@ ENABLE_TESTING() # -- INSTALL IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE) + STRING(REGEX REPLACE "\\\\" "/" PY_SITE ${PY_SITE}) SET(CMAKE_INSTALL_PREFIX "${PY_SITE}/dartflo" CACHE STRING "Install location" FORCE) SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE) ELSE() diff --git a/dart/_src/CMakeLists.txt b/dart/_src/CMakeLists.txt index 62193a7c9bb59ab44c179729925657056c7a8080..c78c46464f4be1f8f7788ca1f565e3e6e7a5e4ba 100644 --- a/dart/_src/CMakeLists.txt +++ b/dart/_src/CMakeLists.txt @@ -48,5 +48,5 @@ SWIG_LINK_LIBRARIES(dartw dart tbox fwk ${PYTHON_LIBRARIES} ) -INSTALL(FILES ${CMAKE_SWIG_OUTDIR}/dartw.py DESTINATION ${CMAKE_INSTALL_PREFIX}) +INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/dartw.py DESTINATION ${CMAKE_INSTALL_PREFIX}) INSTALL(TARGETS _dartw DESTINATION ${CMAKE_INSTALL_PREFIX})