Skip to content

Commit 9af47cb

Browse files
hodoulphodoulp
authored
Adsk Contrib - Improve the library install step (#1578) (#1592)
* Adsk Contrib - Improve the library install step Signed-off-by: Patrick Hodoul <[email protected]> * Docs compilation on *mix plateforms only Signed-off-by: Patrick Hodoul <[email protected]> * Improve the third-party library install Signed-off-by: Patrick Hodoul <[email protected]>
1 parent e5068b7 commit 9af47cb

File tree

11 files changed

+51
-24
lines changed

11 files changed

+51
-24
lines changed

‎.github/workflows/ci_workflow.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# -------------------------------------------------------------------
6565
# VFX CY2022 (Python 3.9)
6666
# -------------------------------------------------------------------
67-
# Clang, Debug, OpenFX
67+
# C++17, Clang, Debug, OpenFX
6868
- build: 13
6969
build-type: Debug
7070
build-shared: 'ON'
@@ -77,7 +77,7 @@ jobs:
7777
cc-compiler: clang
7878
compiler-desc: Clang 9
7979
vfx-cy: 2022
80-
# GCC, no SSE, OpenFX
80+
# C++17, GCC, no SSE, OpenFX
8181
- build: 12
8282
build-type: Release
8383
build-shared: 'ON'
@@ -119,11 +119,11 @@ jobs:
119119
# -------------------------------------------------------------------
120120
# VFX CY2021 (Python 3.7)
121121
# -------------------------------------------------------------------
122-
# Clang, docs
122+
# C++17, Clang
123123
- build: 9
124124
build-type: Release
125125
build-shared: 'ON'
126-
build-docs: 'ON'
126+
build-docs: 'OFF'
127127
build-openfx: 'OFF'
128128
use-sse: 'ON'
129129
use-openexr-half: 'ON'
@@ -187,11 +187,11 @@ jobs:
187187
cc-compiler: gcc
188188
compiler-desc: GCC 6.3.1
189189
vfx-cy: 2020
190-
# C++11, GCC, no SSE, docs
190+
# C++11, GCC, no SSE
191191
- build: 4
192192
build-type: Release
193193
build-shared: 'ON'
194-
build-docs: 'ON'
194+
build-docs: 'OFF'
195195
build-openfx: 'OFF'
196196
use-sse: 'ON'
197197
use-openexr-half: 'ON'
@@ -471,7 +471,7 @@ jobs:
471471
- build: 5
472472
build-type: Release
473473
build-shared: 'ON'
474-
build-docs: 'ON'
474+
build-docs: 'OFF'
475475
build-openfx: 'OFF'
476476
use-sse: 'ON'
477477
use-openexr-half: 'OFF'

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ endif()
289289
configure_file(${CMAKE_SOURCE_DIR}/share/ocio/${OCIO_SETUP_NAME}.in
290290
${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} @ONLY)
291291

292-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} DESTINATION share/ocio/)
292+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/${OCIO_SETUP_NAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
293293

294294

295295
###############################################################################

‎share/cmake/modules/FindHalf.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ if(NOT Half_FOUND)
173173
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
174174
-DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
175175
-DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
176+
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
177+
-DCMAKE_INSTALL_DATADIR=${CMAKE_INSTALL_DATADIR}
178+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
179+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
176180
-DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
177181
-DBUILD_SHARED_LIBS=OFF
178182
-DBUILD_TESTING=OFF

‎share/cmake/modules/FindImath.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ if(NOT Imath_FOUND)
171171
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
172172
-DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
173173
-DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
174+
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
175+
-DCMAKE_INSTALL_DATADIR=${CMAKE_INSTALL_DATADIR}
176+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
177+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
174178
-DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
175179
-DBUILD_SHARED_LIBS=OFF
176180
-DBUILD_TESTING=OFF

‎share/cmake/modules/Findexpat.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ if(NOT expat_FOUND)
208208
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
209209
-DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
210210
-DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
211+
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
212+
-DCMAKE_INSTALL_DATADIR=${CMAKE_INSTALL_DATADIR}
213+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
214+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
211215
-DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
212216
-DEXPAT_BUILD_DOCS=OFF
213217
-DEXPAT_BUILD_EXAMPLES=OFF

‎share/cmake/modules/Findlcms2.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ if(NOT lcms2_FOUND)
103103
# Set find_package standard args
104104
set(lcms2_FOUND TRUE)
105105
set(lcms2_VERSION ${lcms2_FIND_VERSION})
106-
set(lcms2_INCLUDE_DIR "${_EXT_DIST_ROOT}/include/lcms2")
106+
set(lcms2_INCLUDE_DIR "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/lcms2")
107107
set(lcms2_LIBRARY
108-
"${_EXT_DIST_ROOT}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lcms2${CMAKE_STATIC_LIBRARY_SUFFIX}")
108+
"${_EXT_DIST_ROOT}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}lcms2${CMAKE_STATIC_LIBRARY_SUFFIX}")
109109

110110
if(_lcms2_TARGET_CREATE)
111111
if(UNIX)
@@ -133,6 +133,9 @@ if(NOT lcms2_FOUND)
133133
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
134134
-DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
135135
-DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
136+
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
137+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
138+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
136139
-DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
137140
-DBUILD_SHARED_LIBS=OFF
138141
)

‎share/cmake/modules/Findpybind11.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ if(NOT pybind11_FOUND)
164164
-DCMAKE_CXX_STANDARD=${PYBIND11_CXX_STANDARD}
165165
-DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
166166
-DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
167+
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
168+
-DCMAKE_INSTALL_DATADIR=${CMAKE_INSTALL_DATADIR}
169+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
170+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
167171
-DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
168172
# Using FindPython mode (PYBIND11_FINDPYTHON=ON) doesn't seem to
169173
# work when building on docker manylinux images where Development

‎share/cmake/modules/Findpystring.cmake‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,10 @@ if(NOT pystring_FOUND)
7373
# Set find_package standard args
7474
set(pystring_FOUND TRUE)
7575
set(pystring_VERSION ${pystring_FIND_VERSION})
76-
set(pystring_INCLUDE_DIR "${_EXT_DIST_ROOT}/include")
76+
set(pystring_INCLUDE_DIR "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}")
77+
7778
set(pystring_LIBRARY
78-
"${_EXT_DIST_ROOT}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}pystring${CMAKE_STATIC_LIBRARY_SUFFIX}")
79+
"${_EXT_DIST_ROOT}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}pystring${CMAKE_STATIC_LIBRARY_SUFFIX}")
7980

8081
if(_pystring_TARGET_CREATE)
8182
if(MSVC)
@@ -94,6 +95,9 @@ if(NOT pystring_FOUND)
9495
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
9596
-DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
9697
-DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
98+
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
99+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
100+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
97101
-DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
98102
)
99103

‎share/cmake/modules/Findyaml-cpp.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@ if(NOT yaml-cpp_FOUND)
178178
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
179179
-DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
180180
-DCMAKE_INSTALL_PREFIX=${_EXT_DIST_ROOT}
181+
-DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
182+
-DCMAKE_INSTALL_DATADIR=${CMAKE_INSTALL_DATADIR}
183+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
184+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
181185
-DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
182186
-DBUILD_SHARED_LIBS=OFF
183187
-DYAML_BUILD_SHARED_LIBS=OFF

‎share/cmake/projects/Buildlcms2.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
2323
)
2424

2525
install(TARGETS ${PROJECT_NAME}
26-
RUNTIME DESTINATION bin
27-
LIBRARY DESTINATION lib
28-
ARCHIVE DESTINATION lib
29-
PUBLIC_HEADER DESTINATION include/lcms2
26+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
27+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
28+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
29+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lcms2
3030
)

0 commit comments

Comments
 (0)