|
|
e9d72c5 |
From 3d759d35c5cbc393d1848b0476fe6bccb1866ae5 Mon Sep 17 00:00:00 2001
|
|
|
e9d72c5 |
From: Nicolas Chauvet <kwizart@gmail.com>
|
|
|
e9d72c5 |
Date: Wed, 18 Jul 2018 11:08:04 +0200
|
|
|
e9d72c5 |
Subject: [PATCH 1/2] Switch to CMAKE default variables
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
|
|
|
e9d72c5 |
---
|
|
|
e9d72c5 |
CMakeLists.txt | 31 ++++++-----------------------
|
|
|
e9d72c5 |
config/AcesContainer.pc.in | 6 +++---
|
|
|
e9d72c5 |
config/AcesContainerConfig.cmake.in | 4 ++--
|
|
|
e9d72c5 |
3 files changed, 11 insertions(+), 30 deletions(-)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
e9d72c5 |
index 314d42c..f5fa059 100644
|
|
|
e9d72c5 |
--- a/CMakeLists.txt
|
|
|
e9d72c5 |
+++ b/CMakeLists.txt
|
|
|
e9d72c5 |
@@ -48,35 +48,20 @@ cmake_minimum_required (VERSION 2.6)
|
|
|
e9d72c5 |
project (AcesContainer)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
include (GenerateExportHeader)
|
|
|
e9d72c5 |
+include (GNUInstallDirs)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
set( AcesContainer_MAJOR_VERSION 1 )
|
|
|
e9d72c5 |
set( AcesContainer_MINOR_VERSION 0 )
|
|
|
e9d72c5 |
set( AcesContainer_PATCH_VERSION 2 )
|
|
|
e9d72c5 |
set( AcesContainer_VERSION ${AcesContainer_MAJOR_VERSION}.${AcesContainer_MINOR_VERSION}.${AcesContainer_PATCH_VERSION} )
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
-set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )
|
|
|
e9d72c5 |
-set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" )
|
|
|
e9d72c5 |
-
|
|
|
e9d72c5 |
-
|
|
|
e9d72c5 |
if(APPLE)
|
|
|
e9d72c5 |
set( CMAKE_MACOSX_RPATH 1 )
|
|
|
e9d72c5 |
endif()
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
if( WIN32 AND NOT CYGWIN )
|
|
|
e9d72c5 |
- set(DEF_INSTALL_CMAKE_DIR CMake)
|
|
|
e9d72c5 |
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0" )
|
|
|
e9d72c5 |
-else()
|
|
|
e9d72c5 |
- set(DEF_INSTALL_CMAKE_DIR lib/CMake/AcesContainer)
|
|
|
e9d72c5 |
endif()
|
|
|
e9d72c5 |
-set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )
|
|
|
e9d72c5 |
-
|
|
|
e9d72c5 |
-## convert install paths to absolute
|
|
|
e9d72c5 |
-foreach( p LIB INCLUDE CMAKE )
|
|
|
e9d72c5 |
- set( var INSTALL_${p}_DIR )
|
|
|
e9d72c5 |
- if( NOT IS_ABSOLUTE "${${var}}" )
|
|
|
e9d72c5 |
- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" )
|
|
|
e9d72c5 |
- endif()
|
|
|
e9d72c5 |
-endforeach()
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
|
|
|
e9d72c5 |
IF ( BUILD_SHARED_LIBS )
|
|
|
e9d72c5 |
@@ -103,7 +88,7 @@ GENERATE_EXPORT_HEADER( AcesContainer
|
|
|
e9d72c5 |
STATIC_DEFINE AcesContainer_BUILT_AS_STATIC
|
|
|
e9d72c5 |
)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
-install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${INSTALL_LIB_DIR})
|
|
|
e9d72c5 |
+install (TARGETS AcesContainer EXPORT AcesContainerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
|
e9d72c5 |
install (FILES
|
|
|
e9d72c5 |
aces_errors.h
|
|
|
e9d72c5 |
aces_genericWriter.h
|
|
|
e9d72c5 |
@@ -118,14 +103,14 @@ install (FILES
|
|
|
e9d72c5 |
aces_types.h
|
|
|
e9d72c5 |
aces_writeattributes.h
|
|
|
e9d72c5 |
DESTINATION
|
|
|
e9d72c5 |
- ${INSTALL_INCLUDE_DIR}/aces
|
|
|
e9d72c5 |
+ ${CMAKE_INSTALL_INCLUDEDIR}/aces
|
|
|
e9d72c5 |
)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
find_package( PkgConfig )
|
|
|
e9d72c5 |
if ( PKG_CONFIG_FOUND )
|
|
|
e9d72c5 |
configure_file(config/AcesContainer.pc.in "${PROJECT_BINARY_DIR}/AcesContainer.pc" @ONLY)
|
|
|
e9d72c5 |
-install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION lib/pkgconfig COMPONENT dev )
|
|
|
e9d72c5 |
+install( FILES "${PROJECT_BINARY_DIR}/AcesContainer.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
|
|
|
e9d72c5 |
endif()
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
include_directories(
|
|
|
e9d72c5 |
@@ -143,10 +128,6 @@ export(TARGETS AcesContainer
|
|
|
e9d72c5 |
export(PACKAGE AcesContainer)
|
|
|
e9d72c5 |
# export(PACKAGE AcesContainer_lib)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
-# Create the FooBarConfig.cmake and FooBarConfigVersion files
|
|
|
e9d72c5 |
-file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
|
|
|
e9d72c5 |
- "${INSTALL_INCLUDE_DIR}")
|
|
|
e9d72c5 |
-
|
|
|
e9d72c5 |
# ... for the build tree
|
|
|
e9d72c5 |
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
|
|
|
e9d72c5 |
set(CONF_LIB_DIRS "${PROJECT_BINARY_DIR}")
|
|
|
e9d72c5 |
@@ -166,10 +147,10 @@ configure_file(config/AcesContainerConfigVersion.cmake.in
|
|
|
e9d72c5 |
install(FILES
|
|
|
e9d72c5 |
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AcesContainerConfig.cmake"
|
|
|
e9d72c5 |
"${PROJECT_BINARY_DIR}/AcesContainerConfigVersion.cmake"
|
|
|
e9d72c5 |
- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
|
|
|
8ecdf50 |
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
# Install the export set for use with the install-tree
|
|
|
e9d72c5 |
install(EXPORT AcesContainerTargets DESTINATION
|
|
|
e9d72c5 |
- "${INSTALL_CMAKE_DIR}" COMPONENT dev)
|
|
|
8ecdf50 |
+ "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev)
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
diff --git a/config/AcesContainer.pc.in b/config/AcesContainer.pc.in
|
|
|
e9d72c5 |
index 838a1d9..a186346 100644
|
|
|
e9d72c5 |
--- a/config/AcesContainer.pc.in
|
|
|
e9d72c5 |
+++ b/config/AcesContainer.pc.in
|
|
|
e9d72c5 |
@@ -45,9 +45,9 @@
|
|
|
e9d72c5 |
# A.M.P.A.S., WHETHER DISCLOSED OR UNDISCLOSED.
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
prefix=@CMAKE_INSTALL_PREFIX@
|
|
|
e9d72c5 |
-libdir=@INSTALL_LIB_DIR@
|
|
|
e9d72c5 |
-includedir=@INSTALL_INCLUDE_DIR@
|
|
|
e9d72c5 |
-AcesContainer_includedir=@INSTALL_INCLUDE_DIR@/aces
|
|
|
bd5cea2 |
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
|
|
|
bd5cea2 |
+includedir=@CMAKE_INSTALL_PREFIX@@CMAKE_INSTALL_INCLUDEDIR@
|
|
|
bd5cea2 |
+AcesContainer_includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
Name: AcesContainer
|
|
|
e9d72c5 |
Description: A library containing an implementation of ACES Image Container File
|
|
|
e9d72c5 |
diff --git a/config/AcesContainerConfig.cmake.in b/config/AcesContainerConfig.cmake.in
|
|
|
e9d72c5 |
index f5e6392..c35e145 100644
|
|
|
e9d72c5 |
--- a/config/AcesContainerConfig.cmake.in
|
|
|
e9d72c5 |
+++ b/config/AcesContainerConfig.cmake.in
|
|
|
e9d72c5 |
@@ -53,10 +53,10 @@
|
|
|
e9d72c5 |
# find paths
|
|
|
e9d72c5 |
get_filename_component( AcesContainer_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
-set(AcesContainer_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
|
|
|
bd5cea2 |
+set(AcesContainer_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces")
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
set(AcesContainer_LIBRARIES AcesContainer )
|
|
|
e9d72c5 |
-set(AcesContainer_LIBRARY_DIRS "@CONF_LIB_DIRS@" )
|
|
|
bd5cea2 |
+set(AcesContainer_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" )
|
|
|
e9d72c5 |
set(AcesContainer_VERSION "@AcesContainer_VERSION@" )
|
|
|
e9d72c5 |
|
|
|
e9d72c5 |
set(AcesContainer_FOUND 1 )
|
|
|
e9d72c5 |
--
|
|
|
e9d72c5 |
2.17.1
|
|
|
e9d72c5 |
|