From e4ae874992b92b2fb683d96833b714ddebff149b Mon Sep 17 00:00:00 2001
From: Romain Boman <romain.boman@gmail.com>
Date: Thu, 31 Mar 2022 10:50:47 +0200
Subject: [PATCH] change install commands to those used in Metafor (linux OK)
---
CMakeLists.txt | 3 ++-
fwk/_src/CMakeLists.txt | 3 ++-
tbox/_src/CMakeLists.txt | 3 ++-
tboxVtk/_src/CMakeLists.txt | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dc6b95..5b5da42 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 3a75090..78c8658 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 d69dc02..1dea57d 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 f9c2987..f1ad6f7 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})
--
GitLab