|
 |
430ac4b |
diff -up aces_container-1.0/CMakeLists.txt.fixup aces_container-1.0/CMakeLists.txt
|
|
|
430ac4b |
--- aces_container-1.0/CMakeLists.txt.fixup 2013-07-27 01:07:55.000000000 +0200
|
|
|
430ac4b |
+++ aces_container-1.0/CMakeLists.txt 2014-07-29 16:14:03.818875063 +0200
|
|
|
430ac4b |
@@ -58,7 +58,7 @@ set( INSTALL_INCLUDE_DIR include CACHE P
|
|
|
430ac4b |
if( WIN32 AND NOT CYGWIN )
|
|
|
430ac4b |
set(DEF_INSTALL_CMAKE_DIR CMake)
|
|
|
430ac4b |
else()
|
|
|
430ac4b |
- set(DEF_INSTALL_CMAKE_DIR lib/CMake/AcesContainer)
|
|
|
430ac4b |
+ set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/CMake/AcesContainer)
|
|
|
430ac4b |
endif()
|
|
|
430ac4b |
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )
|
|
|
430ac4b |
|
|
|
430ac4b |
@@ -82,7 +82,13 @@ add_library( AcesContainer SHARED
|
|
|
430ac4b |
aces_md5.cc
|
|
|
430ac4b |
)
|
|
|
430ac4b |
|
|
|
430ac4b |
-install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${INSTALL_LIB_DIR})
|
|
|
430ac4b |
+# Set the build version (VERSION) and the API version (SOVERSION)
|
|
|
430ac4b |
+SET_TARGET_PROPERTIES(AcesContainer
|
|
|
430ac4b |
+ PROPERTIES
|
|
|
430ac4b |
+ VERSION ${AcesContainer_VERSION}
|
|
|
430ac4b |
+ SOVERSION ${AcesContainer_MAJOR_VERSION})
|
|
|
430ac4b |
+
|
|
|
430ac4b |
+install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${LIB_INSTALL_DIR})
|
|
|
430ac4b |
install (FILES
|
|
|
430ac4b |
aces_errors.h
|
|
|
430ac4b |
aces_genericWriter.h
|
|
|
430ac4b |
@@ -97,14 +103,14 @@ install (FILES
|
|
|
430ac4b |
aces_types.h
|
|
|
430ac4b |
aces_writeattributes.h
|
|
|
430ac4b |
DESTINATION
|
|
|
430ac4b |
- ${INSTALL_INCLUDE_DIR}/aces
|
|
|
430ac4b |
+ ${INCLUDE_INSTALL_DIR}/aces
|
|
|
430ac4b |
)
|
|
|
430ac4b |
|
|
|
430ac4b |
|
|
|
430ac4b |
find_package( PkgConfig )
|
|
|
430ac4b |
if ( PKG_CONFIG_FOUND )
|
|
|
430ac4b |
configure_file(config/AcesContainer.pc.in "${PROJECT_BINARY_DIR}/AcesContainer.pc" @ONLY)
|
|
|
430ac4b |
-install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION lib/pkgconfig COMPONENT dev )
|
|
|
430ac4b |
+install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT dev )
|
|
|
430ac4b |
endif()
|
|
|
430ac4b |
|
|
|
430ac4b |
include_directories(
|
|
|
430ac4b |
diff -up aces_container-1.0/config/AcesContainerConfig.cmake.in.fixup aces_container-1.0/config/AcesContainerConfig.cmake.in
|
|
|
430ac4b |
--- aces_container-1.0/config/AcesContainerConfig.cmake.in.fixup 2013-07-27 01:07:55.000000000 +0200
|
|
|
430ac4b |
+++ aces_container-1.0/config/AcesContainerConfig.cmake.in 2014-07-29 16:17:38.264924248 +0200
|
|
|
430ac4b |
@@ -53,10 +53,10 @@
|
|
|
430ac4b |
# find paths
|
|
|
430ac4b |
get_filename_component( AcesContainer_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
|
|
|
430ac4b |
|
|
|
430ac4b |
-set(AcesContainer_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
|
|
|
430ac4b |
+set(AcesContainer_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@")
|
|
|
430ac4b |
|
|
|
430ac4b |
set(AcesContainer_LIBRARIES AcesContainer )
|
|
|
430ac4b |
-set(AcesContainer_LIBRARY_DIRS "@CONF_LIB_DIRS@" )
|
|
|
430ac4b |
+set(AcesContainer_LIBRARY_DIRS "@LIB_INSTALL_DIR@" )
|
|
|
430ac4b |
set(AcesContainer_VERSION "@AcesContainer_VERSION@" )
|
|
|
430ac4b |
|
|
|
430ac4b |
set(AcesContainer_FOUND 1 )
|
|
|
430ac4b |
diff -up aces_container-1.0/config/AcesContainerConfigVersion.cmake.in.fixup aces_container-1.0/config/AcesContainerConfigVersion.cmake.in
|
|
|
430ac4b |
diff -up aces_container-1.0/config/AcesContainer.pc.in.fixup aces_container-1.0/config/AcesContainer.pc.in
|
|
|
430ac4b |
--- aces_container-1.0/config/AcesContainer.pc.in.fixup 2013-07-27 01:07:55.000000000 +0200
|
|
|
430ac4b |
+++ aces_container-1.0/config/AcesContainer.pc.in 2014-07-29 16:14:03.820875036 +0200
|
|
|
430ac4b |
@@ -45,7 +45,7 @@
|
|
|
430ac4b |
# A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED.
|
|
|
430ac4b |
|
|
|
430ac4b |
prefix=@CMAKE_INSTALL_PREFIX@
|
|
|
430ac4b |
-libdir=@INSTALL_LIB_DIR@
|
|
|
430ac4b |
+libdir=@LIB_INSTALL_DIR@
|
|
|
430ac4b |
includedir=@INSTALL_INCLUDE_DIR@
|
|
|
430ac4b |
AcesContainer_includedir=@INSTALL_INCLUDE_DIR@/aces
|
|
|
430ac4b |
|