Skip to content
Snippets Groups Projects
Commit e4ae8749 authored by Boman Romain's avatar Boman Romain
Browse files

change install commands to those used in Metafor (linux OK)

parent af19f7ab
No related branches found
No related tags found
1 merge request!4fix release+debug builds on windows
Pipeline #5753 passed
...@@ -87,7 +87,7 @@ MESSAGE(STATUS "Python_FRAMEWORKS=${Python_FRAMEWORKS}") ...@@ -87,7 +87,7 @@ MESSAGE(STATUS "Python_FRAMEWORKS=${Python_FRAMEWORKS}")
# 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()
...@@ -123,6 +123,7 @@ ENABLE_TESTING() ...@@ -123,6 +123,7 @@ ENABLE_TESTING()
# Default install location -> user's python site-packages # Default install location -> user's python site-packages
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}/amfe" CACHE STRING "Install location" FORCE) SET(CMAKE_INSTALL_PREFIX "${PY_SITE}/amfe" CACHE STRING "Install location" FORCE)
ENDIF() ENDIF()
# RPATH for Linux # RPATH for Linux
......
...@@ -42,5 +42,6 @@ SWIG_LINK_LIBRARIES(fwkw ...@@ -42,5 +42,6 @@ SWIG_LINK_LIBRARIES(fwkw
fwk ${PYTHON_LIBRARIES} 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}) INSTALL(TARGETS _fwkw DESTINATION ${CMAKE_INSTALL_PREFIX})
...@@ -46,5 +46,6 @@ SWIG_LINK_LIBRARIES(tboxw ...@@ -46,5 +46,6 @@ SWIG_LINK_LIBRARIES(tboxw
tbox fwk ${PYTHON_LIBRARIES} 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}) INSTALL(TARGETS _tboxw DESTINATION ${CMAKE_INSTALL_PREFIX})
...@@ -48,5 +48,6 @@ SWIG_LINK_LIBRARIES(tboxVtkw ...@@ -48,5 +48,6 @@ SWIG_LINK_LIBRARIES(tboxVtkw
tboxVtk tbox fwk ${PYTHON_LIBRARIES} 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}) INSTALL(TARGETS _tboxVtkw DESTINATION ${CMAKE_INSTALL_PREFIX})
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