Skip to content

Commit 9844fa4

Browse files
[ 423: Non RHEL building ] (#424)
Fixes #423 ### Summarize your change. Have removed the blocking of trying to build on non-RHEL distro and changed to only use lib64 on RHEL distros. ### Describe the reason for the change. Unable to build on eg. Ubuntu ### Describe what you have tested and on which operating system. Have tested with Ubuntu 20.04 using a custom build of Qt5 (and rest is standard repo packages) ### Add a list of changes, and note any that might need special attention during the review. Have not (yet) tested on a RHEL distro, but have made changes that differentiate between RHEL and non-RHEL Linux distros --------- Signed-off-by: Jimmy Christensen <[email protected]> Co-authored-by: Bernard Laberge <[email protected]>
1 parent 3ec54d2 commit 9844fa4

File tree

9 files changed

+16
-12
lines changed

9 files changed

+16
-12
lines changed

cmake/defaults/rv_targets.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ ELSEIF(UNIX)
112112
SET(RV_TARGET_IS_RHEL${RHEL_VERSION_MAJOR}
113113
BOOL TRUE "Detected a Redhat Entreprise Linux OS"
114114
)
115-
ELSE()
116-
MESSAGE(FATAL_ERROR "Unknown or unsupported Linux distribution version; stopping configuration!")
117115
ENDIF()
118116
ELSEIF(WIN32)
119117
MESSAGE(STATUS "Building RV for Microsoft Windows")

cmake/dependencies/dav1d.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,17 @@ SET(_install_dir
2828
SET(_include_dir
2929
${_install_dir}/include
3030
)
31-
IF(RV_TARGET_LINUX)
31+
IF(RHEL_VERBOSE)
32+
SET(_lib_dir_name
33+
lib64
34+
)
3235
SET(_lib_dir
3336
${_install_dir}/lib64
3437
)
3538
ELSE()
39+
SET(_lib_dir_name
40+
lib
41+
)
3642
SET(_lib_dir
3743
${_install_dir}/lib
3844
)
@@ -81,7 +87,7 @@ EXTERNALPROJECT_ADD(
8187
INSTALL_DIR ${_install_dir}
8288
URL ${_download_url}
8389
URL_MD5 ${_download_hash}
84-
CONFIGURE_COMMAND ${_configure_command} ./_build --default-library=${_default_library} --prefix=${_install_dir} -Denable_tests=false -Denable_tools=false
90+
CONFIGURE_COMMAND ${_configure_command} ./_build --libdir=${_lib_dir_name} --default-library=${_default_library} --prefix=${_install_dir} -Denable_tests=false -Denable_tools=false
8591
BUILD_COMMAND ${_make_command} -C _build
8692
INSTALL_COMMAND ${_make_command} -C _build install
8793
COMMAND ${CMAKE_COMMAND} -E copy_directory ${_lib_dir} ${RV_STAGE_LIB_DIR}

cmake/dependencies/glew.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SET(_install_dir
2727
${RV_DEPS_BASE_DIR}/${_target}/install
2828
)
2929

30-
IF(RV_TARGET_LINUX)
30+
IF(RHEL_VERBOSE)
3131
SET(_lib_dir
3232
${_install_dir}/lib64
3333
)
@@ -74,7 +74,7 @@ EXTERNALPROJECT_ADD(
7474
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
7575
CONFIGURE_COMMAND cd auto && ${_make_command}
7676
BUILD_COMMAND ${_make_command} -j${_cpu_count} GLEW_DEST=${_install_dir}
77-
INSTALL_COMMAND ${_make_command} install GLEW_DEST=${_install_dir}
77+
INSTALL_COMMAND ${_make_command} install LIBDIR=${_lib_dir} GLEW_DEST=${_install_dir}
7878
BUILD_IN_SOURCE TRUE
7979
BUILD_ALWAYS FALSE
8080
BUILD_BYPRODUCTS ${_glew_lib}

cmake/dependencies/imath.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ELSEIF(RV_TARGET_WINDOWS)
7272
)
7373
ENDIF()
7474

75-
IF(RV_TARGET_LINUX)
75+
IF(RHEL_VERBOSE)
7676
SET(_lib_dir
7777
${_install_dir}/lib64
7878
)

cmake/dependencies/ocio.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ IF(RV_TARGET_WINDOWS)
7272
"${RV_DEPS_OCIO_DIST_DIR}/lib"
7373
)
7474
ENDIF()
75-
IF(RV_TARGET_LINUX)
75+
IF(RHEL_VERBOSE)
7676
SET(_ociolib_dir
7777
"${RV_DEPS_OCIO_DIST_DIR}/lib64"
7878
)

cmake/dependencies/openexr.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SET(${_target}_ROOT_DIR
3131
${_install_dir}
3232
)
3333

34-
IF(RV_TARGET_LINUX)
34+
IF(RHEL_VERBOSE)
3535
SET(_lib_dir
3636
${_install_dir}/lib64
3737
)

cmake/dependencies/spdlog.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SET(_include_dir
3131
${_install_dir}/include
3232
)
3333

34-
IF(RV_TARGET_LINUX)
34+
IF(RHEL_VERBOSE)
3535
SET(_lib_dir
3636
${_install_dir}/lib64
3737
)

cmake/dependencies/yaml-cpp.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ELSE()
2323
)
2424
ENDIF()
2525

26-
IF(RV_TARGET_LINUX)
26+
IF(RHEL_VERBOSE)
2727
SET(_lib_dir
2828
${RV_DEPS_OCIO_DIST_DIR}/lib64
2929
)

cmake/macros/rv_create_std_deps_vars.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ MACRO(RV_CREATE_STANDARD_DEPS_VARIABLES target_name version make_command configu
3333
SET(_source_dir
3434
${_base_dir}/src
3535
)
36-
IF(RV_TARGET_LINUX)
36+
IF(RHEL_VERBOSE)
3737
SET(_lib_dir
3838
${_install_dir}/lib64
3939
)

0 commit comments

Comments
 (0)