1 Note: for some reason vigra uses a non-standard LIBDIR_SUFFIX definition
2 whereas usually this is LIB_SUFFIX. This patch fixes this since fedora expects
5 diff -baur vigra-1.8.0/CMakeLists.txt vigra-1.8.0.new/CMakeLists.txt
6 --- vigra-1.8.0/CMakeLists.txt 2011-09-20 19:38:36.000000000 +0100
7 +++ vigra-1.8.0.new/CMakeLists.txt 2011-09-24 21:20:55.000000000 +0100
12 +set(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" )
14 ##################################################
16 # global installation commands
20 INSTALL(EXPORT vigra-targets
21 - DESTINATION lib${LIBDIR_SUFFIX}/vigra)
22 + DESTINATION lib${LIB_SUFFIX}/vigra)
23 INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake
24 ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfigVersion.cmake
25 - DESTINATION lib${LIBDIR_SUFFIX}/vigra)
26 + DESTINATION lib${LIB_SUFFIX}/vigra)
27 EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake)
29 ##################################################
31 MESSAGE( STATUS "---------------------------------------------------------" )
33 MESSAGE( STATUS " includes will be installed at: ${CMAKE_INSTALL_PREFIX}/include")
34 -MESSAGE( STATUS " libraries will be installed at: ${CMAKE_INSTALL_PREFIX}/lib${LIBDIR_SUFFIX}")
35 +MESSAGE( STATUS " libraries will be installed at: ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
38 MESSAGE( STATUS " binaries and DLLs will be installed at: ${CMAKE_INSTALL_PREFIX}/bin")
39 diff -baur vigra-1.8.0/doc/vigra/Installation.html vigra-1.8.0.new/doc/vigra/Installation.html
40 --- vigra-1.8.0/doc/vigra/Installation.html 2011-09-20 19:43:37.000000000 +0100
41 +++ vigra-1.8.0.new/doc/vigra/Installation.html 2011-09-24 21:21:39.000000000 +0100
43 <dd>build VIGRA Python bindings (default: 1). Pass -DWITH_VIGRANUMPY=0 to suppress vigranumpy. </dd>
44 <dt>-DWITH_HDF5=1 </dt>
45 <dd>build VIGRA with HDF5 support (default: 1). Pass -DDWITH_HDF5=0 to compile without HDF5. </dd>
46 -<dt>-DLIBDIR_SUFFIX=64 </dt>
47 -<dd>define suffix of lib directory name (default: empty string, i.e. no suffix). Use -DLIBDIR_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64. </dd>
48 +<dt>-DLIB_SUFFIX=64 </dt>
49 +<dd>define suffix of lib directory name (default: empty string, i.e. no suffix). Use -DLIB_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64. </dd>
51 <p>More fine-grained customization (e.g. specification of explicit paths for all dependencies, customization of compiler flags) is possible by editing the file <vigra_build_path>/CMakeCache.txt. This is best done by means of the interactive programs <b>ccmake</b> or <b>cmake-gui</b>. Consult the <a href="http://www.cmake.org/cmake/help/documentation.html">cmake documentation</a> for more detailed help.</p>
52 <p>For using VIGRA in another CMake-built project, you can use the CMake command FIND_PACKAGE(Vigra), which will set the CMake variables ${Vigra_INCLUDE_DIRS} with the correct include path, and import the binary targets (currently vigraimpex) to link against (e.g., TARGET_LINK_LIBRARIES(targetname vigraimpex)). For this mechanism to work, CMake reads a config file VigraConfig.cmake, which is installed along with the library in CMAKE_INSTALL_PREFIX/lib/vigra. Alternatively, you can point CMake (cache entry Vigra_DIR) to VIGRA's build directory, where a corresponding VigraConfig.cmake resides for using the build version directly without installation. </p>
53 diff -baur vigra-1.8.0/docsrc/installation.dxx vigra-1.8.0.new/docsrc/installation.dxx
54 --- vigra-1.8.0/docsrc/installation.dxx 2011-09-20 19:38:36.000000000 +0100
55 +++ vigra-1.8.0.new/docsrc/installation.dxx 2011-09-24 21:19:52.000000000 +0100
59 <DD> build VIGRA with HDF5 support (default: 1). Pass -DDWITH_HDF5=0 to compile without HDF5.
60 - <DT> -DLIBDIR_SUFFIX=64
61 + <DT> -DLIB_SUFFIX=64
62 <DD> define suffix of lib directory name (default: empty string, i.e. no suffix). Use
63 - -DLIBDIR_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64.
64 + -DLIB_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64.
67 More fine-grained customization (e.g. specification of explicit paths for all dependencies, customization of compiler flags) is possible by editing the file <vigra_build_path>/CMakeCache.txt. This is best done by means of the interactive programs <b>ccmake</b> or <b>cmake-gui</b>. Consult the <a href="http://www.cmake.org/cmake/help/documentation.html">cmake documentation</a> for more detailed help.
68 diff -baur vigra-1.8.0/src/impex/CMakeLists.txt vigra-1.8.0.new/src/impex/CMakeLists.txt
69 --- vigra-1.8.0/src/impex/CMakeLists.txt 2011-09-20 19:38:36.000000000 +0100
70 +++ vigra-1.8.0.new/src/impex/CMakeLists.txt 2011-09-24 21:19:52.000000000 +0100
72 INSTALL(TARGETS vigraimpex
74 RUNTIME DESTINATION bin
75 - LIBRARY DESTINATION lib${LIBDIR_SUFFIX}
76 - ARCHIVE DESTINATION lib${LIBDIR_SUFFIX})
77 + LIBRARY DESTINATION lib${LIB_SUFFIX}
78 + ARCHIVE DESTINATION lib${LIB_SUFFIX})