# * ${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS
# The list of include paths
# when someone uses an *INSTALLED* version of ${LIBRARY_NAME}
-# The paths *MUST BE RELATIVE* to INSTALL_PREFIX
+# The paths *MUST BE RELATIVE* to CMAKE_INSTALL_PREFIX
# # A typical example is "include/${LIBRARY_NAME}"
# * ${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS
# Like the previous var but for library paths.
# * ${LIBRARY_NAME}_MINOR_VERSION
# * ${LIBRARY_NAME}_BUILD_VERSION
# * ${LIBRARY_NAME}_INSTALL_FOLDER : if set then install the generated files
-# in INSTALL_PREFIX/lib/${LIBRARY_NAME}_INSTALL_FOLDER
-# instead of INSTALL_PREFIX/lib/${LIBRARY_NAME}
+# in CMAKE_INSTALL_PREFIX/lib/${LIBRARY_NAME}_INSTALL_FOLDER
+# instead of CMAKE_INSTALL_PREFIX/lib/${LIBRARY_NAME}
#
#
# To provide a user defined
# AdditionalUse${LIBRARY_NAME}.cmake
#
# At install-time, the same files are installed
-# in INSTALL_PREFIX/lib/${LIBRARY_NAME}_INSTALL_FOLDER
+# in CMAKE_INSTALL_PREFIX/lib/${LIBRARY_NAME}_INSTALL_FOLDER
# and the file :
# Find${LIBRARY_NAME}.cmake
# is installed in ${CMAKE_ROOT}/Modules/
SET(INSTALL_PATH .)
ELSE(WIN32)
IF(${LIBRARY_NAME}_INSTALL_FOLDER)
- SET(INSTALL_PATH lib/${${LIBRARY_NAME}_INSTALL_FOLDER})
+##EED SET(INSTALL_PATH lib/${${LIBRARY_NAME}_INSTALL_FOLDER})
+ SET(INSTALL_PATH ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS}/${${LIBRARY_NAME}_INSTALL_FOLDER})
ELSE(${LIBRARY_NAME}_INSTALL_FOLDER)
- SET(INSTALL_PATH lib/${LIBRARY_NAME})
+##EED SET(INSTALL_PATH lib/${LIBRARY_NAME})
+ SET(INSTALL_PATH ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS}/${LIBRARY_NAME})
ENDIF(${LIBRARY_NAME}_INSTALL_FOLDER)
ENDIF(WIN32)
-
+ message(STATUS "Library Install Path ${INSTALL_PATH}")
# UseLIBRARY_NAME.cmake
CONFIGURE_FILE(
${CILC_WORK_DIR}/Find${LIBRARY_NAME}.cmake
@ONLY IMMEDIATE
)
+#EED 02 mars 2011
+# INSTALL(
+# FILES ${CILC_WORK_DIR}/Find${LIBRARY_NAME}.cmake
+# DESTINATION ${CMAKE_ROOT}/Modules
+# )
+
+# JPR 04 Mars 2011
INSTALL(
FILES ${CILC_WORK_DIR}/Find${LIBRARY_NAME}.cmake
- DESTINATION ${CMAKE_ROOT}/Modules
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules
)
+
+
#---------------------------------------------------------------------------
MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1)
# Sets the settings to default values
- SET(${LIBRARY_NAME1}_INSTALL_FOLDER ${LIBRARY_NAME1})
+ IF(NOT ${LIBRARY_NAME1}_INSTALL_FOLDER)
+ SET(${LIBRARY_NAME1}_INSTALL_FOLDER ${LIBRARY_NAME1})
+ ENDIF(NOT ${LIBRARY_NAME1}_INSTALL_FOLDER)
+
SET(${LIBRARY_NAME1}_LIBRARIES ${LIBRARY_NAME1})
FILE(RELATIVE_PATH
IF(UNIX)
SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
- SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+ SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CMAKE_CREA_LIB_PATH} )
ELSE(UNIX)
SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
${CILFC_EXECUTABLE_OUTPUT_REL_PATH} )
# ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
ENDIF(UNIX)
- SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1})
+
+ IF(NOT ${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS)
+ SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1})
+ ENDIF(NOT ${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS)
# Invoke the advanced macro
CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME1})