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