Attachment 10281 Details for Bug 23299 – Patch2

[patch] Patch2

use_CMAKE_INSTALL_LIBDIR.patch (text/plain), 1.40 KB, created by Adrien Guichard on 2018-07-13 12:31:52 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrien Guichard

Created: 2018-07-13 12:31:52 CEST

Size: 1.40 KB

patch

obsolete

>--- elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/netgen/CMakeLists.txt.mga7	2018-07-12 08:46:21.189133395 +0200
>+++ elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/netgen/CMakeLists.txt	2018-07-12 08:49:27.879130271 +0200
>@@ -125,4 +125,4 @@
>           libsrc/general/profiler.cpp)
> 
> ADD_LIBRARY(ng ${SOURCES})
>-INSTALL(TARGETS ng RUNTIME DESTINATION "bin" LIBRARY DESTINATION "lib/ElmerGUI/ngcore" ARCHIVE DESTINATION "lib/ElmerGUI/ngcore" COMPONENT "elmergui")
>+INSTALL(TARGETS ng RUNTIME DESTINATION "bin" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT "elmergui")
>--- elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/PythonQt/CMakeLists.txt.mga7	2018-07-13 12:03:19.539994569 +0200
>+++ elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/PythonQt/CMakeLists.txt	2018-07-13 12:04:29.239993403 +0200
>@@ -50,6 +50,6 @@
> INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
> TARGET_LINK_LIBRARIES(PythonQt ${PYTHON_LIBRARIES} ${QT_LIBRARIES})
> MESSAGE(STATUS "PYTHON_LIBRARIES ${PYTHON_LIBRARIES}")
>-INSTALL(TARGETS PythonQt RUNTIME DESTINATION "bin" LIBRARY DESTINATION "lib"
>-	ARCHIVE DESTINATION "lib" COMPONENT "elmergui")
>+INSTALL(TARGETS PythonQt RUNTIME DESTINATION "bin" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
>+	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT "elmergui")
>

--- elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/netgen/CMakeLists.txt.mga7	2018-07-12 08:46:21.189133395 +0200
+++ elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/netgen/CMakeLists.txt	2018-07-12 08:49:27.879130271 +0200
@@ -125,4 +125,4 @@
           libsrc/general/profiler.cpp)
 
 ADD_LIBRARY(ng ${SOURCES})
-INSTALL(TARGETS ng RUNTIME DESTINATION "bin" LIBRARY DESTINATION "lib/ElmerGUI/ngcore" ARCHIVE DESTINATION "lib/ElmerGUI/ngcore" COMPONENT "elmergui")
+INSTALL(TARGETS ng RUNTIME DESTINATION "bin" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT "elmergui")
--- elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/PythonQt/CMakeLists.txt.mga7	2018-07-13 12:03:19.539994569 +0200
+++ elmerfem-40a1744df026be2ba8d064814a4f2052486dbe15/ElmerGUI/PythonQt/CMakeLists.txt	2018-07-13 12:04:29.239993403 +0200
@@ -50,6 +50,6 @@
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
 TARGET_LINK_LIBRARIES(PythonQt ${PYTHON_LIBRARIES} ${QT_LIBRARIES})
 MESSAGE(STATUS "PYTHON_LIBRARIES ${PYTHON_LIBRARIES}")
-INSTALL(TARGETS PythonQt RUNTIME DESTINATION "bin" LIBRARY DESTINATION "lib"
-	ARCHIVE DESTINATION "lib" COMPONENT "elmergui")
+INSTALL(TARGETS PythonQt RUNTIME DESTINATION "bin" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT "elmergui")

Actions: View | Diff

Attachments on bug 23299: 10278 | 10279 | 10280 | 10281