Re: Preparing packages of Ginkgo CAD - a highly requested medical image viewer)
Am Freitag, 6. Mai 2011, 09:29:15 schrieb Sebastian Hilbert:
Hi all,
Andreas recently commented that he had prepared a package (looking for
uploaders btw :-) ) but had a problem with one of his patches.
Upstream commented on it. Please have a look if this can be incorporated and
uploaded.
> Hi Andreas.
>Your patch was almost right, but you forgot to set cadxcore (main library)
>dirs. A small patch is required for system to start up with new paths
>however, so plugin paths are hardcoded and visualizator plugin is required
>for visualization.
> I [upstream ]also renamed the exe as "ginkgocadx" to be more compliant with
lib and share >subdirs names.
>If you agree... this patch would be commited to be present in next release.
>If not partial or fully, we'll be pleased to modify anything you could
>propose.
>Hope it may be helpful.
Best regards,
Sebastian
diff -ur ginkgocadx-2.4.1.1.orig/src/cadxcore/CMakeLists.txt ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt
--- ginkgocadx-2.4.1.1.orig/src/cadxcore/CMakeLists.txt 2011-05-01 12:39:24.000000000 +0200
+++ ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt 2011-05-09 23:58:47.000000000 +0200
@@ -120,9 +120,9 @@
VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
LINK_INTERFACE_LIBRARIES ""
INSTALL_RPATH_USE_LINK_PATH TRUE )
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION share/ginkgocadx/bin)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/bin/lang/es)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/bin/lang/ja)
+INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/es)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/ja)
################ LIBS ################
diff -ur ginkgocadx-2.4.1.1.orig/src/cadxcore/main/entorno.cpp ginkgocadx-2.4.1.1/src/cadxcore/main/entorno.cpp
--- ginkgocadx-2.4.1.1.orig/src/cadxcore/main/entorno.cpp 2011-05-01 12:39:25.000000000 +0200
+++ ginkgocadx-2.4.1.1/src/cadxcore/main/entorno.cpp 2011-05-09 23:58:47.000000000 +0200
@@ -116,16 +116,23 @@
wxString pluginsDir;
wxString langDir;
- #if defined(_WINDOWS) || defined(LINUX)
+ #if defined(_WINDOWS)
pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
+ #elif defined(LINUX)
+ #if defined(CUSTOM_BUILD)
+ pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
+ langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
+ #else
+ pluginsDir = wxStandardPaths::Get().GetPluginsDir() + wxFileName::GetPathSeparator() + wxT("Plugins");
+ langDir = wxStandardPaths::Get().GetResourcesDir() + wxFileName::GetPathSeparator() + wxT("lang");
+ #endif
#else
pluginsDir = wxStandardPaths::Get().GetPluginsDir();
langDir = wxStandardPaths::Get().GetResourcesDir() + wxFileName::GetPathSeparator() + wxT("lang");
- #endif
-
+ #endif
m_GinkgoPluginsDir = TOPATH(pluginsDir);
diff -ur ginkgocadx-2.4.1.1.orig/src/CMake/SysDefs.cmake ginkgocadx-2.4.1.1/src/CMake/SysDefs.cmake
--- ginkgocadx-2.4.1.1.orig/src/CMake/SysDefs.cmake 2011-05-01 12:39:24.000000000 +0200
+++ ginkgocadx-2.4.1.1/src/CMake/SysDefs.cmake 2011-05-09 23:58:47.000000000 +0200
@@ -54,6 +54,9 @@
IF (DEBUG)
ADD_DEFINITIONS(-D_GINKGO_DEBUG -DVTK_DEBUG_LEAKS -DDEBUG -D__WXDEBUG__)
ENDIF()
+ IF(CUSTOM_PACKAGE)
+ ADD_DEFINITIONS(-DCUSTOM_PACKAGE)
+ ENDIF()
ADD_DEFINITIONS(-DUSING_EXTENSIONS -DGINKGO_ARCH_${ARCH})
diff -ur ginkgocadx-2.4.1.1.orig/src/CMakeLists.txt ginkgocadx-2.4.1.1/src/CMakeLists.txt
--- ginkgocadx-2.4.1.1.orig/src/CMakeLists.txt 2011-05-01 12:39:24.000000000 +0200
+++ ginkgocadx-2.4.1.1/src/CMakeLists.txt 2011-05-09 23:58:47.000000000 +0200
@@ -81,7 +81,7 @@
ELSEIF(LINUX AND CUSTOM_PACKAGE)
SET(GINKGO_PROJECT "ginkgo-${ARCH}" CACHE PARENT_SCOPE "")
ELSE()
- SET(GINKGO_PROJECT "ginkgo" CACHE PARENT_SCOPE "")
+ SET(GINKGO_PROJECT "ginkgocadx" CACHE PARENT_SCOPE "")
ENDIF()
SET(GINKGO_PLUGINS "" CACHE PARENT_SCOPE "")
diff -ur ginkgocadx-2.4.1.1.orig/src/fooextension/CMakeLists.txt ginkgocadx-2.4.1.1/src/fooextension/CMakeLists.txt
--- ginkgocadx-2.4.1.1.orig/src/fooextension/CMakeLists.txt 2011-05-01 12:39:25.000000000 +0200
+++ ginkgocadx-2.4.1.1/src/fooextension/CMakeLists.txt 2011-05-09 23:58:47.000000000 +0200
@@ -33,11 +33,11 @@
IF(LINUX AND NOT CUSTOM_PACKAGE)
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
+ LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
ENDIF()
ENDIF()
@@ -47,7 +47,7 @@
VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
LINK_INTERFACE_LIBRARIES ""
INSTALL_RPATH_USE_LINK_PATH TRUE )
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION share/ginkgocadx/bin/Plugins)
+INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
################ LIBS ################
diff -ur ginkgocadx-2.4.1.1.orig/src/ginkgo/CMakeLists.txt ginkgocadx-2.4.1.1/src/ginkgo/CMakeLists.txt
--- ginkgocadx-2.4.1.1.orig/src/ginkgo/CMakeLists.txt 2011-05-01 12:39:25.000000000 +0200
+++ ginkgocadx-2.4.1.1/src/ginkgo/CMakeLists.txt 2011-05-09 23:58:47.000000000 +0200
@@ -11,11 +11,11 @@
IF(LINUX AND NOT CUSTOM_PACKAGE)
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
+ LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
ENDIF()
ENDIF()
@@ -23,9 +23,9 @@
TARGET_LINK_LIBRARIES(${PROJECT_NAME} CADxCore)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
LINK_INTERFACE_LIBRARIES ""
- CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
+ CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION share/ginkgocadx/bin)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
IF(USE_CUSTOM_WX)
ADD_DEFINITIONS(${wxWidgets_defines})
diff -ur ginkgocadx-2.4.1.1.orig/src/visualizator/CMakeLists.txt ginkgocadx-2.4.1.1/src/visualizator/CMakeLists.txt
--- ginkgocadx-2.4.1.1.orig/src/visualizator/CMakeLists.txt 2011-05-01 12:39:24.000000000 +0200
+++ ginkgocadx-2.4.1.1/src/visualizator/CMakeLists.txt 2011-05-09 23:58:47.000000000 +0200
@@ -52,11 +52,11 @@
IF(LINUX AND NOT CUSTOM_PACKAGE)
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
+ LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
ENDIF()
ENDIF()
@@ -66,9 +66,9 @@
VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
LINK_INTERFACE_LIBRARIES ""
INSTALL_RPATH_USE_LINK_PATH TRUE )
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION share/ginkgocadx/bin/Plugins)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION share/ginkgocadx/bin/lang/es)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/visualizator.mo DESTINATION share/ginkgocadx/bin/lang/ja)
+INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION share/ginkgocadx/lang/es)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/visualizator.mo DESTINATION share/ginkgocadx/lang/ja)
################ LIBS ################
Reply to: