diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dc6b95b7a92588820b3aec97234b10022358ce9..5b5da42d071ae94d6989d1bb93a7538f3467114a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ MESSAGE(STATUS "Python_FRAMEWORKS=${Python_FRAMEWORKS}") # 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() @@ -123,6 +123,7 @@ ENABLE_TESTING() # Default install location -> user's python site-packages 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}/amfe" CACHE STRING "Install location" FORCE) ENDIF() # RPATH for Linux diff --git a/fwk/_src/CMakeLists.txt b/fwk/_src/CMakeLists.txt index 3a750903f5fb5e6cd642d570ab3eb121ff34e4ed..78c8658478fbd983c3d1625165f0e6957d27a216 100644 --- a/fwk/_src/CMakeLists.txt +++ b/fwk/_src/CMakeLists.txt @@ -42,5 +42,6 @@ SWIG_LINK_LIBRARIES(fwkw fwk ${PYTHON_LIBRARIES} ) -INSTALL(FILES ${CMAKE_SWIG_OUTDIR}/fwkw.py DESTINATION ${CMAKE_INSTALL_PREFIX}) +INSTALL(FILES "${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/fwkw.py" + DESTINATION ${CMAKE_INSTALL_PREFIX}) INSTALL(TARGETS _fwkw DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/tbox/_src/CMakeLists.txt b/tbox/_src/CMakeLists.txt index d69dc02e8e4af181e959708319ee48c0585cabda..1dea57d843faf64c93ee41ba2a9ce4ceee12ea56 100644 --- a/tbox/_src/CMakeLists.txt +++ b/tbox/_src/CMakeLists.txt @@ -46,5 +46,6 @@ SWIG_LINK_LIBRARIES(tboxw tbox fwk ${PYTHON_LIBRARIES} ) -INSTALL(FILES ${CMAKE_SWIG_OUTDIR}/tboxw.py DESTINATION ${CMAKE_INSTALL_PREFIX}) +INSTALL(FILES "${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/tboxw.py" + DESTINATION ${CMAKE_INSTALL_PREFIX}) INSTALL(TARGETS _tboxw DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/tboxVtk/_src/CMakeLists.txt b/tboxVtk/_src/CMakeLists.txt index f9c298713fd5b37bd973ef2e841f700d43d34e96..f1ad6f73a27613af52c9e94bbd1f84d55285a4f0 100644 --- a/tboxVtk/_src/CMakeLists.txt +++ b/tboxVtk/_src/CMakeLists.txt @@ -48,5 +48,6 @@ SWIG_LINK_LIBRARIES(tboxVtkw tboxVtk tbox fwk ${PYTHON_LIBRARIES} ) -INSTALL(FILES ${CMAKE_SWIG_OUTDIR}/tboxVtkw.py DESTINATION ${CMAKE_INSTALL_PREFIX}) +INSTALL(FILES "${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/tboxVtkw.py" + DESTINATION ${CMAKE_INSTALL_PREFIX}) INSTALL(TARGETS _tboxVtkw DESTINATION ${CMAKE_INSTALL_PREFIX})