Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 442880 | Differences between
and this patch

Collapse All | Expand All

(-)a/cmake/tribits/package_arch/TribitsGlobalMacros.cmake (-15 lines)
Lines 205-225 Link Here
205
      "If on, then the properter LINK_SEARCH_START_STATIC will be added to all executables." )
205
      "If on, then the properter LINK_SEARCH_START_STATIC will be added to all executables." )
206
  ENDIF()
206
  ENDIF()
207
  
207
  
208
  ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR "include"
209
    CACHE PATH
210
    "Location where the headers will be installed.  If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  Default is 'include'"
211
    )
212
  
213
  ADVANCED_SET(${PROJECT_NAME}_INSTALL_LIB_DIR "lib"
214
    CACHE PATH
215
    "Location where the libraries will be installed.  If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  Default is 'lib'"
216
    )
217
  
218
  ADVANCED_SET(${PROJECT_NAME}_INSTALL_RUNTIME_DIR "bin"
219
    CACHE PATH
220
    "Location where the runtime DLLs will be installed.  If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  Default is 'bin'"
221
    )
222
  
223
  IF(WIN32 AND NOT CYGWIN)
208
  IF(WIN32 AND NOT CYGWIN)
224
    SET(${PROJECT_NAME}_ENABLE_EXPORT_MAKEFILES_DEFAULT OFF)
209
    SET(${PROJECT_NAME}_ENABLE_EXPORT_MAKEFILES_DEFAULT OFF)
225
  ELSE()
210
  ELSE()
(-)a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake (-4 / +4 lines)
Lines 367-373 Link Here
367
367
368
  INSTALL(
368
  INSTALL(
369
    FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
369
    FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
370
    DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
370
    DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
371
    RENAME ${PACKAGE_NAME}Config.cmake
371
    RENAME ${PACKAGE_NAME}Config.cmake
372
  )
372
  )
373
373
Lines 563-569 Link Here
563
  IF(HAS_INSTALL_TARGETS)
563
  IF(HAS_INSTALL_TARGETS)
564
    INSTALL(
564
    INSTALL(
565
      EXPORT ${PROJECT_NAME}
565
      EXPORT ${PROJECT_NAME}
566
      DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
566
      DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
567
      FILE ${PROJECT_NAME}Targets.cmake
567
      FILE ${PROJECT_NAME}Targets.cmake
568
      )
568
      )
569
    # Import the targets in applications.
569
    # Import the targets in applications.
Lines 589-595 Link Here
589
589
590
  INSTALL(
590
  INSTALL(
591
    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
591
    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
592
    DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
592
    DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
593
    RENAME ${PROJECT_NAME}Config.cmake
593
    RENAME ${PROJECT_NAME}Config.cmake
594
  )
594
  )
595
  
595
  
Lines 632-638 Link Here
632
632
633
  INSTALL(
633
  INSTALL(
634
    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
634
    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
635
    DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
635
    DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
636
  )
636
  )
637
637
638
ENDFUNCTION()
638
ENDFUNCTION()
(-)a/packages/fei/base/CMakeLists.txt (-1 / +1 lines)
Lines 54-58 Link Here
54
  )
54
  )
55
55
56
INSTALL(FILES ${HEADERS} DESTINATION
56
INSTALL(FILES ${HEADERS} DESTINATION
57
   ${CMAKE_INSTALL_PREFIX}/include)
57
   ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
58
58

Return to bug 442880