diff -ur vigra-1.7.0-src/CMakeLists.txt vigra-1.7.0-src.new/CMakeLists.txt --- vigra-1.7.0-src/CMakeLists.txt 2010-04-15 19:27:25.000000000 +0100 +++ vigra-1.7.0-src.new/CMakeLists.txt 2010-04-21 00:09:48.000000000 +0100 @@ -113,6 +113,8 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/include/vigra DESTINATION include) INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/include/vigra DESTINATION include) +set(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" ) + ################################################## # # enable CPack package generation @@ -145,8 +147,8 @@ # export targets: #export(TARGETS all FILE -INSTALL(EXPORT vigra-targets DESTINATION lib/vigra) -INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake DESTINATION lib/vigra) +INSTALL(EXPORT vigra-targets DESTINATION lib${LIB_SUFFIX}/vigra) +INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake DESTINATION lib${LIB_SUFFIX}/vigra) EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake) ################################################## @@ -205,7 +207,7 @@ MESSAGE( STATUS "---------------------------------------------------------" ) MESSAGE( STATUS " includes will be installed at: ${CMAKE_INSTALL_PREFIX}/include") -MESSAGE( STATUS " libraries will be installed at: ${CMAKE_INSTALL_PREFIX}/lib") +MESSAGE( STATUS " libraries will be installed at: ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") IF (MSVC) MESSAGE( STATUS " binaries and DLLs will be installed at: ${CMAKE_INSTALL_PREFIX}/bin") diff -ur vigra-1.7.0-src/config/FindVIGRANUMPY_DEPENDENCIES.cmake vigra-1.7.0-src.new/config/FindVIGRANUMPY_DEPENDENCIES.cmake --- vigra-1.7.0-src/config/FindVIGRANUMPY_DEPENDENCIES.cmake 2010-04-15 19:27:25.000000000 +0100 +++ vigra-1.7.0-src.new/config/FindVIGRANUMPY_DEPENDENCIES.cmake 2010-04-20 23:30:16.000000000 +0100 @@ -36,7 +36,7 @@ ###################################################################### IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$") execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c - "from distutils.sysconfig import *; print get_python_lib()" + "from distutils.sysconfig import *; print get_python_lib(1)" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR) ENDIF() diff -ur vigra-1.7.0-src/src/impex/CMakeLists.txt vigra-1.7.0-src.new/src/impex/CMakeLists.txt --- vigra-1.7.0-src/src/impex/CMakeLists.txt 2010-04-15 19:27:39.000000000 +0100 +++ vigra-1.7.0-src.new/src/impex/CMakeLists.txt 2010-04-20 23:24:44.000000000 +0100 @@ -62,5 +62,5 @@ INSTALL(TARGETS vigraimpex EXPORT vigra-targets RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX})