Skip to content
Snippets Groups Projects
Commit 8d60acd5 authored by Adrien Crovato's avatar Adrien Crovato
Browse files

Update install procedure and amfe

parent 448eee18
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,7 @@ ENDIF() ...@@ -75,7 +75,7 @@ ENDIF()
# SWIG # SWIG
FIND_PACKAGE(SWIG REQUIRED) FIND_PACKAGE(SWIG REQUIRED)
IF(CMAKE_GENERATOR MATCHES "Visual Studio") # not MSVC because of nmake & jom 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() ELSE()
SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}") SET(CMAKE_SWIG_OUTDIR "${EXECUTABLE_OUTPUT_PATH}")
ENDIF() ENDIF()
...@@ -108,6 +108,7 @@ ENABLE_TESTING() ...@@ -108,6 +108,7 @@ ENABLE_TESTING()
# -- INSTALL # -- INSTALL
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m site --user-site OUTPUT_VARIABLE PY_SITE OUTPUT_STRIP_TRAILING_WHITESPACE) 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 "${PY_SITE}/dartflo" CACHE STRING "Install location" FORCE)
SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE) SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
ELSE() ELSE()
......
...@@ -48,5 +48,5 @@ SWIG_LINK_LIBRARIES(dartw ...@@ -48,5 +48,5 @@ SWIG_LINK_LIBRARIES(dartw
dart tbox fwk ${PYTHON_LIBRARIES} 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}) INSTALL(TARGETS _dartw DESTINATION ${CMAKE_INSTALL_PREFIX})
Subproject commit 87212cfb034a92cc83acfeea751f076a84c12779 Subproject commit e4ae874992b92b2fb683d96833b714ddebff149b
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment