Packman Build Service PMBS

File djv-1.0.5_path.patch of Package djv (Revision 825960996abdf2a8bd88543c5e21a004)

Currently displaying revision 825960996abdf2a8bd88543c5e21a004 , Show latest

--- a/bin/djv_convert/CMakeLists.txt
+++ b/bin/djv_convert/CMakeLists.txt
@@ -54,16 +54,5 @@ install(
     TARGETS djv_convert
     RUNTIME DESTINATION bin)
 
-if (UNIX)
 
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_convert_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_convert.sh
-        @ONLY)
-
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_convert.sh
-        DESTINATION bin)
-
-endif (UNIX)
 
--- a/bin/djv_info/CMakeLists.txt
+++ b/bin/djv_info/CMakeLists.txt
@@ -54,16 +54,5 @@ install(
     TARGETS djv_info
     RUNTIME DESTINATION bin)
 
-if (UNIX)
 
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_info_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_info.sh
-        @ONLY)
-
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_info.sh
-        DESTINATION bin)
-
-endif (UNIX)
 
--- a/bin/djv_ls/CMakeLists.txt
+++ b/bin/djv_ls/CMakeLists.txt
@@ -54,16 +54,4 @@ install(
     TARGETS djv_ls
     RUNTIME DESTINATION bin)
 
-if (UNIX)
-
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_ls_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_ls.sh
-        @ONLY)
-
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_ls.sh
-        DESTINATION bin)
-
-endif (UNIX)
 
--- a/bin/djv_view/CMakeLists.txt
+++ b/bin/djv_view/CMakeLists.txt
@@ -72,15 +72,6 @@ if (APPLE)
 
 elseif (UNIX)
 
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_view_linux.sh.in
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_view.sh
-        @ONLY)
-
-    install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_view.sh
-        DESTINATION bin)
-
     install(
         FILES ${PROJECT_BINARY_DIR}/etc/Linux/djv_view.desktop
         DESTINATION /usr/share/applications)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -102,12 +102,12 @@ set(legal
 install(
     FILES
     ${html}
-    DESTINATION doc)
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc)
 
 install(
     FILES
     ${images}
-    DESTINATION doc/images)
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc/images)
 
 #install(
 #    DIRECTORY
@@ -117,4 +117,4 @@ install(
 install(
     FILES
     ${legal}
-    DESTINATION doc)
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc)
--- a/lib/djvCore/CMakeLists.txt
+++ b/lib/djvCore/CMakeLists.txt
@@ -169,7 +169,7 @@ add_library(djvCore ${header} ${source}
 
 target_link_libraries(djvCore ${djvCoreDeps})
 
-set_target_properties(djvCore PROPERTIES FOLDER lib)
+set_target_properties(djvCore PROPERTIES VERSION 0.0.0 SOVERSION 0)
 
 if (djvInstallRpath)
 
@@ -190,6 +190,6 @@ install(
 install(
     TARGETS djvCore
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
--- a/lib/djvGui/CMakeLists.txt
+++ b/lib/djvGui/CMakeLists.txt
@@ -229,7 +229,7 @@ add_library(djvGui ${header} ${source} $
 
 target_link_libraries(djvGui ${djvGuiDeps})
 
-set_target_properties(djvGui PROPERTIES FOLDER lib)
+set_target_properties(djvGui PROPERTIES VERSION 0.0.0 SOVERSION 0)
 
 if (djvInstallRpath)
 
@@ -250,6 +250,6 @@ install(
 install(
     TARGETS djvGui
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
--- a/lib/djvViewLib/CMakeLists.txt
+++ b/lib/djvViewLib/CMakeLists.txt
@@ -212,7 +212,7 @@ add_library(djvViewLib ${header} ${sourc
 
 target_link_libraries(djvViewLib ${djvGuiLibs})
 
-set_target_properties(djvViewLib PROPERTIES FOLDER lib)
+set_target_properties(djvViewLib PROPERTIES VERSION 0.0.0 SOVERSION 0)
 
 if (djvInstallRpath)
 
@@ -233,6 +233,6 @@ install(
 install(
     TARGETS djvViewLib
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
--- a/plugins/djvCineonPlugin/CMakeLists.txt
+++ b/plugins/djvCineonPlugin/CMakeLists.txt
@@ -63,10 +63,10 @@ install(
 install(
     TARGETS djvCineonPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvCineonWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvDpxPlugin/CMakeLists.txt
+++ b/plugins/djvDpxPlugin/CMakeLists.txt
@@ -67,10 +67,10 @@ install(
 install(
     TARGETS djvDpxPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvDpxWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvIffPlugin/CMakeLists.txt
+++ b/plugins/djvIffPlugin/CMakeLists.txt
@@ -61,10 +61,10 @@ install(
 install(
     TARGETS djvIffPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvIffWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvIflPlugin/CMakeLists.txt
+++ b/plugins/djvIflPlugin/CMakeLists.txt
@@ -29,5 +29,5 @@ endif (djvInstallRpath)
 install(
     TARGETS djvIflPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvJpegPlugin/CMakeLists.txt
+++ b/plugins/djvJpegPlugin/CMakeLists.txt
@@ -62,11 +62,11 @@ install(
 install(
     TARGETS djvJpegPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvJpegWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 
--- a/plugins/djvLutPlugin/CMakeLists.txt
+++ b/plugins/djvLutPlugin/CMakeLists.txt
@@ -61,10 +61,10 @@ install(
 install(
     TARGETS djvLutPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvLutWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvOpenExrPlugin/CMakeLists.txt
+++ b/plugins/djvOpenExrPlugin/CMakeLists.txt
@@ -63,10 +63,10 @@ install(
 install(
     TARGETS djvOpenExrPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvOpenExrWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvPicPlugin/CMakeLists.txt
+++ b/plugins/djvPicPlugin/CMakeLists.txt
@@ -40,5 +40,5 @@ install(
 install(
     TARGETS djvPicPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvPngPlugin/CMakeLists.txt
+++ b/plugins/djvPngPlugin/CMakeLists.txt
@@ -37,5 +37,5 @@ endif (djvInstallRpath)
 install(
     TARGETS djvPngPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvPpmPlugin/CMakeLists.txt
+++ b/plugins/djvPpmPlugin/CMakeLists.txt
@@ -61,10 +61,10 @@ install(
 install(
     TARGETS djvPpmPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvPpmWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvRlaPlugin/CMakeLists.txt
+++ b/plugins/djvRlaPlugin/CMakeLists.txt
@@ -29,5 +29,5 @@ endif (djvInstallRpath)
 install(
     TARGETS djvRlaPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvSgiPlugin/CMakeLists.txt
+++ b/plugins/djvSgiPlugin/CMakeLists.txt
@@ -61,10 +61,10 @@ install(
 install(
     TARGETS djvSgiPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvSgiWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvTargaPlugin/CMakeLists.txt
+++ b/plugins/djvTargaPlugin/CMakeLists.txt
@@ -61,10 +61,10 @@ install(
 install(
     TARGETS djvTargaPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvTargaWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/plugins/djvTiffPlugin/CMakeLists.txt
+++ b/plugins/djvTiffPlugin/CMakeLists.txt
@@ -74,10 +74,10 @@ install(
 install(
     TARGETS djvTiffPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvTiffWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
--- a/tests/djvTestLib/CMakeLists.txt
+++ b/tests/djvTestLib/CMakeLists.txt
@@ -32,13 +32,3 @@ if (djvInstallRpath)
 
 endif (djvInstallRpath)
 
-install(
-    FILES ${header}
-    DESTINATION include)
-
-install(
-    TARGETS djvTestLib
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
-
--- a/plugins/djvFFmpegPlugin/CMakeLists.txt
+++ b/plugins/djvFFmpegPlugin/CMakeLists.txt
@@ -62,10 +62,10 @@ install(
 install(
     TARGETS djvFFmpegPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION li${LIB_SUFFIX}/djvb
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
 install(
     TARGETS djvFFmpegWidgetPlugin
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION li${LIB_SUFFIX}/djvb
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)