--- CMakeLists.txt.orig 2008-12-04 13:38:05.000000000 -0200 +++ CMakeLists.txt 2008-12-04 13:42:23.000000000 -0200 @@ -4,6 +4,8 @@ PROJECT(FLTK) CMAKE_MINIMUM_REQUIRED(VERSION 2.0) +set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) + # The FLTK version SET(FLTK_VERSION_MAJOR "1") SET(FLTK_VERSION_MINOR "1") @@ -384,18 +386,18 @@ # For installed tree usage SET(FLTK_FLUID_COMMAND "${CMAKE_INSTALL_PREFIX}/bin/fluid") -SET(FLTK_LIBRARY_DEPENDS_FILE ${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKLibraryDepends.cmake) +SET(FLTK_LIBRARY_DEPENDS_FILE ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/FLTK-${FLTK_VERSION}/FLTKLibraryDepends.cmake) SET(FLTK_EXECUTABLE_DIRS "${CMAKE_INSTALL_PREFIX}/bin") -SET(FLTK_LIBRARY_DIRS "${CMAKE_INSTALL_PREFIX}/lib") -SET(FLTK_USE_FILE "${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKUse.cmake") +SET(FLTK_LIBRARY_DIRS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") +SET(FLTK_USE_FILE "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/FLTK-${FLTK_VERSION}/FLTKUse.cmake") SET(FLTK_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/") -SET(FLTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKBuildSettings.cmake) +SET(FLTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/FLTK-${FLTK_VERSION}/FLTKBuildSettings.cmake) SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(exec_prefix "${prefix}") SET(exec_prefix_set "no") SET(bindir "${prefix}/bin") SET(includedir "${prefix}") -SET(libdir "${prefix}/lib") +SET(libdir "${prefix}/lib${LIB_SUFFIX}") SET(srcdir ".") CONFIGURE_FILE("${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in" @@ -404,7 +406,7 @@ "${FLTK_BINARY_DIR}/CMake/fltk-config" @ONLY IMMEDIATE) INSTALL_FILES(/include/FL FILES ${FLTK_HEADER_FILES}) -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_SOURCE_DIR}/CMake/FLTKUse.cmake") -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKBuildSettings.cmake") -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKLibraryDepends.cmake") -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/CMake/FLTKConfig.cmake") +INSTALL_FILES(/lib${LIB_SUFFIX}/FLTK-${FLTK_VERSION} FILES "${FLTK_SOURCE_DIR}/CMake/FLTKUse.cmake") +INSTALL_FILES(/lib${LIB_SUFFIX}/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKBuildSettings.cmake") +INSTALL_FILES(/lib${LIB_SUFFIX}/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKLibraryDepends.cmake") +INSTALL_FILES(/lib${LIB_SUFFIX}/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/CMake/FLTKConfig.cmake") --- src/CMakeLists.txt.orig 2008-12-04 13:51:41.000000000 -0200 +++ src/CMakeLists.txt 2008-12-04 13:52:36.000000000 -0200 @@ -167,7 +167,7 @@ ) ADD_LIBRARY(fltk ${CPPFILES} ${CFILES}) -INSTALL_TARGETS(/lib fltk) +INSTALL_TARGETS(/lib${LIB_SUFFIX} fltk) SET_TARGET_PROPERTIES(fltk PROPERTIES VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} @@ -181,7 +181,7 @@ IF(OPENGL_FOUND) ADD_LIBRARY(fltk_gl ${GLCPPFILES}) - INSTALL_TARGETS(/lib fltk_gl) + INSTALL_TARGETS(/lib${LIB_SUFFIX} fltk_gl) TARGET_LINK_LIBRARIES(fltk_gl fltk ${OPENGL_LIBRARIES}) SET_TARGET_PROPERTIES(fltk_gl PROPERTIES @@ -190,7 +190,7 @@ ENDIF(OPENGL_FOUND) ADD_LIBRARY(fltk_forms ${FLCPPFILES}) -INSTALL_TARGETS(/lib fltk_forms) +INSTALL_TARGETS(/lib${LIB_SUFFIX} fltk_forms) TARGET_LINK_LIBRARIES(fltk_forms fltk) SET_TARGET_PROPERTIES(fltk_forms PROPERTIES @@ -198,7 +198,7 @@ SOVERSION ${FLTK_VERSION_PATCH}) ADD_LIBRARY(fltk_images ${IMGCPPFILES}) -INSTALL_TARGETS(/lib fltk_images) +INSTALL_TARGETS(/lib${LIB_SUFFIX} fltk_images) TARGET_LINK_LIBRARIES(fltk_images fltk ${FLTK_PNG_LIBRARIES} ${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES}) SET_TARGET_PROPERTIES(fltk_images