From f7dac1ebd0edc7f5d2ac37d9cddb3a1a8c1e525d Mon Sep 17 00:00:00 2001 From: Denis Barbier Date: Wed, 18 May 2011 01:36:17 +0200 Subject: [PATCH] Use relative paths in INSTALL targets Install RUNTIME in TOOLKIT_INSTALL_BIN_DIR instead of TOOLKIT_INSTALL_LIB_DIR. Also fix whitespaces. --- CMakeLists.txt | 86 +++++++++++++++++-------------------- adm/cmake/OccBuildKit.cmake | 17 ++++---- 2 files changed, 48 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c11f24b6c..7449955f98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ OPTION_WITH_DEFAULT( ${PROJECT_NAME}_WITH_GL2PS "Build with GL2PS" OFF ) OPTION_WITH_DEFAULT( ${PROJECT_NAME}_WITH_FREEIMAGE "Build with FreeImage" OFF ) OPTION_WITH_DEFAULT( ${PROJECT_NAME}_EXTRA_WARNINGS "Enable Maximum Warnings Level" OFF ) MARK_AS_ADVANCED(${PROJECT_NAME}_EXTRA_WARNINGS) - + IF( NOT DEFINED ${PROJECT_NAME}_MULTITHREAD_LIBRARY) SET( ${PROJECT_NAME}_MULTITHREAD_LIBRARY "NONE" CACHE STRING "(values are: NONE TBB OPENMP)" ) ENDIF( NOT DEFINED ${PROJECT_NAME}_MULTITHREAD_LIBRARY) @@ -95,13 +95,8 @@ SET( CMAKE_INSTALL_PREFIX "${${PROJECT_NAME}_INSTALL_PREFIX}" CACHE INTERNAL "Pr IF( ${PROJECT_NAME}_BUILD_SHARED_LIB ) SET( ${PROJECT_NAME}_LIBRARY_TYPE SHARED ) - SET( ${PROJECT_NAME}_INSTALL_TYPE LIBRARY ) - IF( WIN32 ) - SET( ${PROJECT_NAME}_INSTALL_TYPE RUNTIME ) - ENDIF( WIN32 ) ELSE( ${PROJECT_NAME}_BUILD_SHARED_LIB ) SET( ${PROJECT_NAME}_LIBRARY_TYPE STATIC ) - SET( ${PROJECT_NAME}_INSTALL_TYPE ARCHIVE ) IF ( WIN32 ) ADD_DEFINITIONS("-DHAVE_NO_DLL") ENDIF( WIN32 ) @@ -167,11 +162,10 @@ IF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_FREEIMAGE) FIND_PATH(FREEIMAGE_INCLUDE_DIR FreeImagePlus.h DOC "Location of header files for FreeImage" ${CMAKE_SYSTEM_INCLUDE_PATH}) IF(FREEIMAGE_INCLUDE_DIR) FIND_LIBRARY( FREEIMAGE_LIBRARY freeimageplus "Path to the freeimage library" ) - + IF(CMAKE_CONFIGURATION_TYPES) FIND_LIBRARY( FREEIMAGE_LIBRARY_DEBUG freeimageplusd "Path to the freeimage debug library" ) ENDIF(CMAKE_CONFIGURATION_TYPES) - ENDIF(FREEIMAGE_INCLUDE_DIR) MARK_AS_ADVANCED(FREEIMAGE_INCLUDE_DIR FREEIMAGE_LIBRARY) ENDIF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_FREEIMAGE) @@ -196,14 +190,14 @@ IF(${PROJECT_NAME}_VISUALISATION_FULL) SET(OPENGL_INCLUDE_DIR /usr/X11R6/include/) SET(OPENGL_LIBRARIES /usr/X11R6/lib/libGL.dylib /usr/X11R6/lib/libGLU.dylib) ENDIF (NOT APPLE) - + ## FreeType / FTGL IF(NOT ${PROJECT_NAME}_USE_BUNDLE) FIND_PACKAGE(Freetype REQUIRED) ELSE (NOT ${PROJECT_NAME}_USE_BUNDLE) FIND_PACKAGE(Freetype) ENDIF(NOT ${PROJECT_NAME}_USE_BUNDLE) - + FIND_PATH(FTGL_V212_INCLUDE_DIR FTGL/FTFace.h DOC "Location of header files for FTGL 2.1.2" ${CMAKE_SYSTEM_INCLUDE_PATH}) FIND_PATH(FTGL_INCLUDE_DIR FTGL/ftgl.h "Location of header files for FTGL > 2.1.2" ${CMAKE_SYSTEM_INCLUDE_PATH}) IF(NOT FTGL_V212_INCLUDE_DIR AND FTGL_INCLUDE_DIR) @@ -215,6 +209,7 @@ IF(${PROJECT_NAME}_VISUALISATION_FULL) FIND_LIBRARY(FREETYPE_LIBRARY_DEBUG freetyped "Location of freetype debug library") ENDIF(CMAKE_CONFIGURATION_TYPES) MARK_AS_ADVANCED(X11_Xmu_LIB FTGL_V212_INCLUDE_DIR FTGL_INCLUDE_DIR FTGL_LIBRARY) + ## GL2PS IF(${PROJECT_NAME}_WITH_GL2PS) FIND_PATH(GL2PS_INCLUDE_DIR gl2ps.h DOC "Location of header files for GL2PS (containing gl2ps.h)" ${CMAKE_SYSTEM_INCLUDE_PATH}) @@ -300,31 +295,30 @@ IF(${PROJECT_NAME}_DRAW) ENDIF(${PROJECT_NAME}_DRAW) IF (${PROJECT_NAME}_USE_BUNDLE AND OCE_BUNDLE_ROOT_PATH) - MESSAGE("Using OCE Bundle") - IF (${PROJECT_NAME}_VISUALISATION_FULL) - MESSAGE("Using OCE Bundle VSFull") - SET(FTGL_INCLUDE_DIR ${OCE_BUNDLE_ROOT_PATH}/include/FTGL CACHE PATH "" FORCE) - SET(FREETYPE_INCLUDE_DIR_freetype2 ${OCE_BUNDLE_ROOT_PATH}/include/freetype CACHE PATH "" FORCE) - SET(FREETYPE_INCLUDE_DIR_ft2build ${OCE_BUNDLE_ROOT_PATH}/include/freetype CACHE PATH "" FORCE) - SET(FREETYPE_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/freetype.lib CACHE FILEPATH "" FORCE) - SET(FREETYPE_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/freetyped.lib CACHE FILEPATH "" FORCE) - SET(FTGL_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/ftgl.lib CACHE FILEPATH "" FORCE) - SET(FTGL_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/ftgld.lib CACHE FILEPATH "" FORCE) - ENDIF (${PROJECT_NAME}_VISUALISATION_FULL) - - IF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_GL2PS) - SET(GL2PS_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/gl2ps.lib CACHE FILEPATH "" FORCE) - SET(GL2PS_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/gl2psd.lib CACHE FILEPATH "" FORCE) - SET(GL2PS_INCLUDE_DIR ${OCE_BUNDLE_ROOT_PATH}/include/gl2ps CACHE PATH "" FORCE) - ENDIF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_GL2PS) - - IF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_FREEIMAGE) - SET(FREEIMAGE_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/FreeImage.lib CACHE FILEPATH "" FORCE) - SET(FREEIMAGE_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/FreeImaged.lib CACHE FILEPATH "" FORCE) - SET(FREEIMAGE_INCLUDE_DIR ${OCE_BUNDLE_ROOT_PATH}/include/FreeImage CACHE PATH "" FORCE) - ENDIF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_FREEIMAGE) - - ENDIF(${PROJECT_NAME}_USE_BUNDLE AND OCE_BUNDLE_ROOT_PATH) + MESSAGE("Using OCE Bundle") + IF (${PROJECT_NAME}_VISUALISATION_FULL) + MESSAGE("Using OCE Bundle VSFull") + SET(FTGL_INCLUDE_DIR ${OCE_BUNDLE_ROOT_PATH}/include/FTGL CACHE PATH "" FORCE) + SET(FREETYPE_INCLUDE_DIR_freetype2 ${OCE_BUNDLE_ROOT_PATH}/include/freetype CACHE PATH "" FORCE) + SET(FREETYPE_INCLUDE_DIR_ft2build ${OCE_BUNDLE_ROOT_PATH}/include/freetype CACHE PATH "" FORCE) + SET(FREETYPE_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/freetype.lib CACHE FILEPATH "" FORCE) + SET(FREETYPE_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/freetyped.lib CACHE FILEPATH "" FORCE) + SET(FTGL_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/ftgl.lib CACHE FILEPATH "" FORCE) + SET(FTGL_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/ftgld.lib CACHE FILEPATH "" FORCE) + ENDIF (${PROJECT_NAME}_VISUALISATION_FULL) + + IF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_GL2PS) + SET(GL2PS_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/gl2ps.lib CACHE FILEPATH "" FORCE) + SET(GL2PS_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/gl2psd.lib CACHE FILEPATH "" FORCE) + SET(GL2PS_INCLUDE_DIR ${OCE_BUNDLE_ROOT_PATH}/include/gl2ps CACHE PATH "" FORCE) + ENDIF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_GL2PS) + + IF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_FREEIMAGE) + SET(FREEIMAGE_LIBRARY ${OCE_BUNDLE_ROOT_PATH}/lib/FreeImage.lib CACHE FILEPATH "" FORCE) + SET(FREEIMAGE_LIBRARY_DEBUG ${OCE_BUNDLE_ROOT_PATH}/libd/FreeImaged.lib CACHE FILEPATH "" FORCE) + SET(FREEIMAGE_INCLUDE_DIR ${OCE_BUNDLE_ROOT_PATH}/include/FreeImage CACHE PATH "" FORCE) + ENDIF(${PROJECT_NAME}_VISUALISATION AND ${PROJECT_NAME}_WITH_FREEIMAGE) +ENDIF(${PROJECT_NAME}_USE_BUNDLE AND OCE_BUNDLE_ROOT_PATH) IF(MSVC) SET( CMAKE_DEBUG_POSTFIX "d" ) @@ -598,49 +592,49 @@ ENDIF(MSVC_IDE) # platforms IF(WIN32) - SET(_PSUFFIX "/Win${BIT}") + SET(_PSUFFIX "Win${BIT}/") ELSE(WIN32) SET(_PSUFFIX "") ENDIF(WIN32) # Binaries IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_BIN_DIR) - SET(${PROJECT_NAME}_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}${_PSUFFIX}/bin) + SET(${PROJECT_NAME}_INSTALL_BIN_DIR ${_PSUFFIX}bin) ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_BIN_DIR) IF(CMAKE_CONFIGURATION_TYPES) IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_BIN_DEBUG_DIR) - SET(${PROJECT_NAME}_INSTALL_BIN_DEBUG_DIR ${CMAKE_INSTALL_PREFIX}${_PSUFFIX}/bind) + SET(${PROJECT_NAME}_INSTALL_BIN_DEBUG_DIR ${_PSUFFIX}bind) ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_BIN_DEBUG_DIR) ENDIF(CMAKE_CONFIGURATION_TYPES) # Libraries IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_LIB_DIR) - SET(${PROJECT_NAME}_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}${_PSUFFIX}/lib) + SET(${PROJECT_NAME}_INSTALL_LIB_DIR ${_PSUFFIX}lib) ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_LIB_DIR) IF(CMAKE_CONFIGURATION_TYPES) IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_LIB_DEBUG_DIR) - SET(${PROJECT_NAME}_INSTALL_LIB_DEBUG_DIR ${CMAKE_INSTALL_PREFIX}${_PSUFFIX}/libd) + SET(${PROJECT_NAME}_INSTALL_LIB_DEBUG_DIR ${_PSUFFIX}libd) ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_LIB_DEBUG_DIR) ENDIF(CMAKE_CONFIGURATION_TYPES) -IF(WIN32 AND MSVC) +IF(MSVC) IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR) SET(${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR ${${PROJECT_NAME}_INSTALL_LIB_DIR}) IF(CMAKE_CONFIGURATION_TYPES) SET(${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DEBUG_DIR ${${PROJECT_NAME}_INSTALL_LIB_DEBUG_DIR}) ENDIF(CMAKE_CONFIGURATION_TYPES) ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR) -ELSE(WIN32 AND MSVC) +ELSE(MSVC) IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR) - SET(${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}) + SET(${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR lib/${PROJECT_NAME}) ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR) -ENDIF(WIN32 AND MSVC) +ENDIF(MSVC) # Includes IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_INCLUDE_DIR) - SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/inc) + SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR inc) ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_INCLUDE_DIR) # Scripts @@ -714,7 +708,7 @@ MACRO(PROCESS_OCC_MODULE modulename modules) SET(TOOLKIT_INCLUDE_DIRECTORIES "") SET(TOOLKIT_LIBS "") ADD_SUBDIRECTORY( adm/cmake/${module} ) - + IF (USE_SOLUTION_FOLDERS) SET_TARGET_PROPERTIES(${module} PROPERTIES FOLDER ${modulename} ) ENDIF(USE_SOLUTION_FOLDERS) diff --git a/adm/cmake/OccBuildKit.cmake b/adm/cmake/OccBuildKit.cmake index 9dd374f49c..92013bba99 100644 --- a/adm/cmake/OccBuildKit.cmake +++ b/adm/cmake/OccBuildKit.cmake @@ -78,26 +78,25 @@ ELSE(TOOLKIT_IS_PRIVATE) ENDIF(TOOLKIT_IS_PRIVATE) IF(WIN32 AND CMAKE_CONFIGURATION_TYPES) - # In win32 put the .dll in the bin folder - INSTALL(TARGETS ${TOOLKIT} + # In win32 put the .dll in the bin folder + INSTALL(TARGETS ${TOOLKIT} RUNTIME DESTINATION ${TOOLKIT_INSTALL_BIN_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel COMPONENT RuntimeLibraries LIBRARY DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} CONFIGURATIONS Release RelWithDebInfo MinSizeRel COMPONENT Development ) -INSTALL(TARGETS ${TOOLKIT} + INSTALL(TARGETS ${TOOLKIT} RUNTIME DESTINATION ${TOOLKIT_INSTALL_BIN_DEBUG_DIR} CONFIGURATIONS "Debug" COMPONENT RuntimeLibraries LIBRARY DESTINATION ${TOOLKIT_INSTALL_LIB_DEBUG_DIR} CONFIGURATIONS "Debug" COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${TOOLKIT_INSTALL_LIB_DEBUG_DIR} CONFIGURATIONS "Debug" COMPONENT Development ) - IF(MSVC AND CMAKE_CONFIGURATION_TYPES AND ${PROJECT_NAME}_INSTALL_PDB_FILES ) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${TOOLKIT}.pdb DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} CONFIGURATIONS RelWithDebInfo) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${TOOLKIT}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${TOOLKIT_INSTALL_LIB_DEBUG_DIR} CONFIGURATIONS Debug) - ENDIF() - + IF(MSVC AND ${PROJECT_NAME}_INSTALL_PDB_FILES ) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${TOOLKIT}.pdb DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} CONFIGURATIONS RelWithDebInfo) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${TOOLKIT}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${TOOLKIT_INSTALL_LIB_DEBUG_DIR} CONFIGURATIONS Debug) + ENDIF(MSVC AND ${PROJECT_NAME}_INSTALL_PDB_FILES ) ELSE(WIN32 AND CMAKE_CONFIGURATION_TYPES) INSTALL(TARGETS ${TOOLKIT} - RUNTIME DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries + RUNTIME DESTINATION ${TOOLKIT_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries LIBRARY DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries ARCHIVE DESTINATION ${TOOLKIT_INSTALL_LIB_DIR} COMPONENT Development )