Remove OpenColorIOHeaders target and hardcoded install paths (#1471)

* Remove OpenColorIOHeaders target Signed-off-by: Rémi Achard <remiachard@gmail.com> * Avoid hardcoding install paths Signed-off-by: Rémi Achard <remiachard@gmail.com> * Update remaining hardcoded install paths Signed-off-by: Rémi Achard <remiachard@gmail.com> * Replace LIB_SUFFIX by CMAKE_INSTALL_LIBDIR Signed-off-by: Rémi Achard <remiachard@gmail.com> Co-authored-by: Patrick Hodoul <patrick.hodoul@autodesk.com>
AcademySoftwareFoundation · Sep 9, 2021 · 641abe5 · 641abe5
1 parent 959b3f7
commit 641abe5
Show file tree

Hide file tree

Showing 19 changed files with 245 additions and 272 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -259,7 +259,6 @@ if(OCIO_BUILD_DOCS)
 endif()
 add_subdirectory(tests)
 add_subdirectory(src)
-add_subdirectory(include)
 add_subdirectory(ext)
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -61,8 +61,8 @@
     description = "@CMAKE_PROJECT_DESCRIPTION@"
     version = "@CMAKE_PROJECT_VERSION@"
     version_major = "@OpenColorIO_VERSION_MAJOR@"
-    version_minor = "@OpenColorIO_VERSION_MAJOR@"
-    version_patch = "@OpenColorIO_VERSION_MAJOR@"
+    version_minor = "@OpenColorIO_VERSION_MINOR@"
+    version_patch = "@OpenColorIO_VERSION_PATCH@"
     ocio_namespace = "@OCIO_NAMESPACE@"
 
 author = "Contributors to the {} Project".format(project)

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
diff --git a/include/OpenColorIO/CMakeLists.txt b/include/OpenColorIO/CMakeLists.txt