-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
contrib/openshadinglanguage: fix install
- Loading branch information
Showing
2 changed files
with
45 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
fixes https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1771 | ||
by hardcoding the right paths | ||
|
||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -294,13 +294,13 @@ | ||
install (FILES "${OSL_PROJECT_CONFIG}" "${OSL_VERSION_CONFIG}" | ||
DESTINATION "${OSL_CONFIG_INSTALL_DIR}") | ||
|
||
-install (FILES src/cmake/llvm_macros.cmake DESTINATION cmake) | ||
+install (FILES src/cmake/llvm_macros.cmake DESTINATION lib/cmake) | ||
|
||
set (PERMISSION_FLAGS OWNER_EXECUTE OWNER_READ OWNER_WRITE | ||
GROUP_EXECUTE GROUP_READ | ||
WORLD_EXECUTE WORLD_READ) | ||
install (FILES src/build-scripts/serialize-bc.py | ||
- DESTINATION build-scripts | ||
+ DESTINATION bin | ||
PERMISSIONS ${PERMISSION_FLAGS}) | ||
|
||
# install targets files | ||
|
||
--- b/src/cmake/llvm_macros.cmake | ||
+++ b/src/cmake/llvm_macros.cmake | ||
@@ -112,9 +112,9 @@ | ||
# Serialize the linked bitcode into a CPP file | ||
set ( src_bc_cpp "${CMAKE_CURRENT_BINARY_DIR}/${output_name}.bc.cpp" ) | ||
add_custom_command ( OUTPUT ${src_bc_cpp} | ||
- COMMAND ${Python_EXECUTABLE} "${_THIS_MODULE_BASE_DIR}/../build-scripts/serialize-bc.py" | ||
+ COMMAND ${Python_EXECUTABLE} "${_THIS_MODULE_BASE_DIR}/../bin/serialize-bc.py" | ||
${linked_src_bc} ${src_bc_cpp} ${output_name} | ||
- DEPENDS "${_THIS_MODULE_BASE_DIR}/../build-scripts/serialize-bc.py" ${linked_src_bc} | ||
+ DEPENDS "${_THIS_MODULE_BASE_DIR}/../bin/serialize-bc.py" ${linked_src_bc} | ||
${exec_headers} ${PROJECT_PUBLIC_HEADERS} | ||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters