diff --git a/packages/conan/recipes/osl/conanfile.py b/packages/conan/recipes/osl/conanfile.py index 8be2dc09..8a20d5b5 100644 --- a/packages/conan/recipes/osl/conanfile.py +++ b/packages/conan/recipes/osl/conanfile.py @@ -107,6 +107,8 @@ def generate(self): tc.variables["USE_PYTHON"] = self.options.with_python tc.variables["USE_QT"] = self.options.with_qt tc.variables["OPTIXHOME"] = "/usr/local/NVIDIA-OptiX-SDK-9.0.0" # ASWF FIXME + if Version(self.version) <= "1.13": + tc.variables["INSTALL_DOCS"] = "OFF" # skip documentation build tc.generate() cd = CMakeDeps(self) @@ -116,7 +118,7 @@ def build(self): apply_conandata_patches(self) cmake = CMake(self) cmake.configure() - cmake.build() + cmake.build(cli_args=["--verbose"]) def package(self): # ASWF: license files in package subdirectory diff --git a/packages/conan/recipes/osl/patches/1.13.11.0-cmake-oiio-imath-includes.patch_IMATHX b/packages/conan/recipes/osl/patches/1.13.11.0-cmake-oiio-imath-includes.patch_IMATHX deleted file mode 100644 index 5aeedaa9..00000000 --- a/packages/conan/recipes/osl/patches/1.13.11.0-cmake-oiio-imath-includes.patch_IMATHX +++ /dev/null @@ -1,176 +0,0 @@ -diff --git src/liboslexec/CMakeLists.txt src/liboslexec/CMakeLists.txt -index d99dd79ac..bfda2778a 100644 ---- src/liboslexec/CMakeLists.txt -+++ src/liboslexec/CMakeLists.txt -@@ -194,9 +194,9 @@ - set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR}) - list(APPEND include_dirs ${CMAKE_SOURCE_DIR}/src/include) - list(APPEND include_dirs ${CMAKE_BINARY_DIR}/include) -- list(APPEND include_dirs ${IMATH_INCLUDES}) -- list(APPEND include_dirs ${OPENEXR_INCLUDES}) -- list(APPEND include_dirs ${OpenImageIO_INCLUDES}) -+ list(APPEND include_dirs ${Imath_INCLUDE_DIRS}) -+ list(APPEND include_dirs ${OpenEXR_INCLUDE_DIRS}) -+ list(APPEND include_dirs ${OpenImageIO_INCLUDE_DIRS}) - list(APPEND include_dirs ${Boost_INCLUDE_DIRS}) - - EMBED_LLVM_BITCODE_IN_CPP ( "${llvm_ops_srcs}" "_host" "osl_llvm_compiled_ops" lib_src "" "${include_dirs}") -@@ -516,7 +516,7 @@ - target_include_directories (${batched_target_lib} - PUBLIC - ${CMAKE_INSTALL_FULL_INCLUDEDIR} -- ${IMATH_INCLUDES} -+ ${Imath_INCLUDE_DIRS} - ) - target_link_libraries (${batched_target_lib} - PUBLIC -@@ -533,7 +533,7 @@ - target_include_directories (${local_lib} - PUBLIC - ${CMAKE_INSTALL_FULL_INCLUDEDIR} -- ${IMATH_INCLUDES} -+ ${Imath_INCLUDE_DIRS} - PRIVATE - "${CMAKE_SOURCE_DIR}/src/liboslcomp" - ) -diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake -index d99dd79ac..bfda2778a 100644 ---- src/cmake/externalpackages.cmake -+++ src/cmake/externalpackages.cmake -@@ -86,14 +86,14 @@ - RECOMMEND_MIN 2.5 - RECOMMEND_MIN_REASON - "Even extremely critical patches are no longer supplied to < 2.5" -- PRINT IMATH_INCLUDES -+ PRINT IMATH_INCLUDE_DIRS - ) - # Force Imath includes to be before everything else to ensure that we have - # the right Imath/OpenEXR version, not some older version in the system - # library. This shouldn't be necessary, except for the common case of people - # building against Imath/OpenEXR 3.x when there is still a system-level - # install version of 2.x. --include_directories(BEFORE ${IMATH_INCLUDES}) -+include_directories(BEFORE ${IMATH_INCLUDE_DIRS}) - if (MSVC AND NOT LINKSTATIC) - add_definitions (-DOPENEXR_DLL) # Is this needed for new versions? - endif () -@@ -120,8 +120,8 @@ - VERSION_MAX 18.9 - PRINT LLVM_SYSTEM_LIBRARIES CLANG_LIBRARIES) - # ensure include directory is added (in case of non-standard locations --include_directories (BEFORE SYSTEM "${LLVM_INCLUDES}") --link_directories ("${LLVM_LIB_DIR}") -+include_directories (BEFORE SYSTEM "${LLVM_INCLUDE_DIRS}") -+link_directories ("${LLVM_LIBBRARY_DIRS}") - # Extract and concatenate major & minor, remove wayward patches, - # dots, and "svn" or other suffixes. - string (REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\1\\2" OSL_LLVM_VERSION ${LLVM_VERSION}) -@@ -218,7 +218,7 @@ - set (CUDA_INCLUDES ${CUDA_TOOLKIT_ROOT_DIR}/include) - include_directories (BEFORE "${CUDA_INCLUDES}") - -- STRING (FIND ${LLVM_TARGETS} "NVPTX" nvptx_index) -+ STRING (FIND "${LLVM_TARGETS_TO_BUILD}" "NVPTX" nvptx_index) - if (NOT ${nvptx_index} GREATER -1) - message (FATAL_ERROR "NVPTX target is not available in the provided LLVM build") - endif() -diff --git src/testshade/CMakeLists.txt src/testshade/CMakeLists.txt -index d99dd79ac..bfda2778a 100644 ---- src/testshade/CMakeLists.txt -+++ src/testshade/CMakeLists.txt -@@ -68,9 +68,9 @@ - set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR}) - list(APPEND include_dirs ${CMAKE_SOURCE_DIR}/src/include) - list(APPEND include_dirs ${CMAKE_BINARY_DIR}/include) --list(APPEND include_dirs ${IMATH_INCLUDES}) --list(APPEND include_dirs ${OPENEXR_INCLUDES}) --list(APPEND include_dirs ${OpenImageIO_INCLUDES}) -+list(APPEND include_dirs ${Imath_INCLUDE_DIRS}) -+list(APPEND include_dirs ${OpenEXR_INCLUDE_DIRS}) -+list(APPEND include_dirs ${OpenImageIO_INCLUDE_DIRS}) - list(APPEND include_dirs ${Boost_INCLUDE_DIRS}) - - EMBED_LLVM_BITCODE_IN_CPP ( "${rs_srcs}" "_host" "testshade_llvm_compiled_rs" testshade_srcs "-DOSL_HOST_RS_BITCODE=1" "${include_dirs}") -diff --git src/include/OSL/Imathx/ImathLimits.h src/include/OSL/Imathx/ImathLimits.h -index d99dd79ac..bfda2778a 100644 ---- src/include/OSL/Imathx/ImathLimits.h -+++ src/include/OSL/Imathx/ImathLimits.h -@@ -43,7 +43,7 @@ - // - //---------------------------------------------------------------- - --#include -+#include - #include - #include - -diff --git src/include/OSL/Imathx/ImathColor.h src/include/OSL/Imathx/ImathColor.h -index d99dd79ac..bfda2778a 100644 ---- src/include/OSL/Imathx/ImathColor.h -+++ src/include/OSL/Imathx/ImathColor.h -@@ -44,7 +44,7 @@ - //---------------------------------------------------- - - #include "ImathVec.h" --#include -+#include - // #include "half.h" - - #ifndef IMATH_HOSTDEVICE -diff --git src/include/OSL/Imathx/ImathFun.h src/include/OSL/Imathx/ImathFun.h -index d99dd79ac..bfda2778a 100644 ---- src/include/OSL/Imathx/ImathFun.h -+++ src/include/OSL/Imathx/ImathFun.h -@@ -43,10 +43,10 @@ - // - //----------------------------------------------------------------------------- - --#include -+#include - #include "ImathLimits.h" --#include --#include -+#include -+#include - - IMATH_INTERNAL_NAMESPACE_HEADER_ENTER - -diff --git src/include/OSL/Imathx/ImathMatrix.h src/include/OSL/Imathx/ImathMatrix.h -index d99dd79ac..bfda2778a 100644 ---- src/include/OSL/Imathx/ImathMatrix.h -+++ src/include/OSL/Imathx/ImathMatrix.h -@@ -43,12 +43,12 @@ - // - //---------------------------------------------------------------- - --#include -+#include - #include "ImathFun.h" --#include -+#include - #include "ImathVec.h" --#include --#include -+#include -+#include - - #include - #include -diff --git src/include/OSL/Imathx/ImathVec.h src/include/OSL/Imathx/ImathVec.h -index d99dd79ac..bfda2778a 100644 ---- src/include/OSL/Imathx/ImathVec.h -+++ src/include/OSL/Imathx/ImathVec.h -@@ -43,10 +43,10 @@ - // - //---------------------------------------------------- - --#include -+#include - #include "ImathLimits.h" --#include --#include -+#include -+#include - - #include - #include diff --git a/packages/conan/recipes/osl/patches/1.14.7.0-cmake-oiio-imath-includes.patch_BEFORE_PTX b/packages/conan/recipes/osl/patches/1.14.7.0-cmake-oiio-imath-includes.patch_BEFORE_PTX deleted file mode 100644 index bd359dc7..00000000 --- a/packages/conan/recipes/osl/patches/1.14.7.0-cmake-oiio-imath-includes.patch_BEFORE_PTX +++ /dev/null @@ -1,158 +0,0 @@ -diff --git src/liboslcomp/CMakeLists.txt src/liboslcomp/CMakeLists.txt -index d99dd79ac..bfda2778a 100644 ---- src/liboslcomp/CMakeLists.txt -+++ src/liboslcomp/CMakeLists.txt -@@ -28,7 +28,7 @@ - $ - PRIVATE - ${CMAKE_DL_LIBS} -- ${CLANG_LIBRARIES} ${LLVM_LIBRARIES} ${LLVM_LDFLAGS} -+ ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LIBS} ${LLVM_LDFLAGS} - ${LLVM_SYSTEM_LIBRARIES}) - target_include_directories (${local_lib} BEFORE PRIVATE ${OpenImageIO_INCLUDES}) - -diff --git src/liboslexec/CMakeLists.txt src/liboslexec/CMakeLists.txt -index d99dd79ac..bfda2778a 100644 ---- src/liboslexec/CMakeLists.txt -+++ src/liboslexec/CMakeLists.txt -@@ -187,8 +187,8 @@ - set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR}) - list(APPEND include_dirs ${CMAKE_SOURCE_DIR}/src/include) - list(APPEND include_dirs ${CMAKE_BINARY_DIR}/include) -- list(APPEND include_dirs ${IMATH_INCLUDES}) -- list(APPEND include_dirs ${OpenImageIO_INCLUDES}) -+ list(APPEND include_dirs ${Imath_INCLUDE_DIRS}) -+ list(APPEND include_dirs ${OpenImageIO_INCLUDE_DIRS}) - list(APPEND include_dirs ${ROBINMAP_INCLUDES}) - - EMBED_LLVM_BITCODE_IN_CPP ( "${llvm_ops_srcs}" "_host" "osl_llvm_compiled_ops" lib_src "" "${include_dirs}") -@@ -514,7 +514,7 @@ - target_include_directories (${batched_target_lib} - PUBLIC - ${CMAKE_INSTALL_FULL_INCLUDEDIR} -- ${IMATH_INCLUDES} -+ ${Imath_INCLUDE_DIRS} - PRIVATE - ${ROBINMAP_INCLUDES} - ) -@@ -534,13 +534,13 @@ - target_include_directories (${local_lib} - PUBLIC - ${CMAKE_INSTALL_FULL_INCLUDEDIR} -- ${IMATH_INCLUDES} -+ ${Imath_INCLUDE_DIRS} - PRIVATE - "${CMAKE_SOURCE_DIR}/src/liboslcomp" - ${ROBINMAP_INCLUDES} - ) - --target_include_directories (${local_lib} BEFORE PRIVATE ${OpenImageIO_INCLUDES}) -+target_include_directories (${local_lib} BEFORE PRIVATE ${OpenImageIO_INCLUDE_DIRS}) - - target_compile_definitions (${local_lib} - PRIVATE -@@ -578,7 +578,7 @@ - PRIVATE - pugixml::pugixml - ${CMAKE_DL_LIBS} -- ${LLVM_LIBRARIES} ${LLVM_LDFLAGS} ${LLVM_SYSTEM_LIBRARIES} -+ ${LLVM_AVAILABLE_LIBS} ${LLVM_LDFLAGS} ${LLVM_SYSTEM_LIBRARIES} - ) - - target_compile_features (${local_lib} -@@ -610,19 +610,19 @@ - if (OSL_BUILD_TESTS AND BUILD_TESTING) - add_executable (accum_test accum_test.cpp) - target_link_libraries (accum_test PRIVATE oslexec ${CMAKE_DL_LIBS}) -- target_include_directories (accum_test BEFORE PRIVATE ${OpenImageIO_INCLUDES}) -+ target_include_directories (accum_test BEFORE PRIVATE ${OpenImageIO_INCLUDE_DIRS}) - set_target_properties (accum_test PROPERTIES FOLDER "Unit Tests") - add_test (unit_accum ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/accum_test) - - add_executable (dual_test dual_test.cpp) - target_link_libraries (dual_test PRIVATE OpenImageIO::OpenImageIO Imath::Imath ${CMAKE_DL_LIBS}) -- target_include_directories (dual_test BEFORE PRIVATE ${OpenImageIO_INCLUDES}) -+ target_include_directories (dual_test BEFORE PRIVATE ${OpenImageIO_INCLUDE_DIRS}) - set_target_properties (dual_test PROPERTIES FOLDER "Unit Tests") - add_test (unit_dual ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/dual_test) - - add_executable (llvmutil_test llvmutil_test.cpp) - target_link_libraries (llvmutil_test PRIVATE oslexec ${CMAKE_DL_LIBS}) -- target_include_directories (llvmutil_test BEFORE PRIVATE ${OpenImageIO_INCLUDES}) -+ target_include_directories (llvmutil_test BEFORE PRIVATE ${OpenImageIO_INCLUDE_DIRS}) - set_target_properties (llvmutil_test PROPERTIES FOLDER "Unit Tests") - add_test (unit_llvmutil ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/llvmutil_test) - endif () -diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake -index d99dd79ac..bfda2778a 100644 ---- src/cmake/externalpackages.cmake -+++ src/cmake/externalpackages.cmake -@@ -38,11 +38,11 @@ - # IlmBase & OpenEXR - checked_find_package (Imath REQUIRED - VERSION_MIN 3.1 -- PRINT IMATH_INCLUDES Imath_VERSION -+ PRINT IMATH_INCLUDE_DIRS Imath_VERSION - ) - # Force Imath includes to be before everything else to ensure that we have - # the right Imath version, not some older version in the system library. --include_directories(BEFORE ${IMATH_INCLUDES}) -+include_directories(BEFORE ${IMATH_INCLUDE_DIRS}) - set (OSL_USING_IMATH 3) - - -@@ -62,8 +62,8 @@ - PRINT LLVM_SYSTEM_LIBRARIES CLANG_LIBRARIES - LLVM_SHARED_MODE) - # ensure include directory is added (in case of non-standard locations --include_directories (BEFORE SYSTEM "${LLVM_INCLUDES}") --link_directories ("${LLVM_LIB_DIR}") -+include_directories (BEFORE SYSTEM "${LLVM_INCLUDE_DIRS}") -+link_directories ("${LLVM_LIBRARY_DIRS}") - # Extract and concatenate major & minor, remove wayward patches, - # dots, and "svn" or other suffixes. - string (REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\1\\2" OSL_LLVM_VERSION ${LLVM_VERSION}) -@@ -110,6 +110,19 @@ - set(LLVM_NEW_PASS_MANAGER OFF) - endif() - -+# In Config/Conan we don't load modules/FindLLVM.cmake -+foreach (COMPONENT clangFrontend clangDriver clangSerialization -+ clangParse clangSema clangAnalysis clangAST -+ clangASTMatchers clangEdit clangLex -+ clangSupport clangAPINotes clangBasic) -+ find_library ( _CLANG_${COMPONENT}_LIBRARY -+ NAMES ${COMPONENT} -+ PATHS ${LLVM_LIBRARY_DIRS} -+ NO_DEFAULT_PATH) -+ if (_CLANG_${COMPONENT}_LIBRARY) -+ list (APPEND CLANG_LIBRARIES ${_CLANG_${COMPONENT}_LIBRARY}) -+ endif () -+endforeach () - - checked_find_package (partio) - -@@ -156,7 +169,7 @@ - set (CUDA_INCLUDES ${CUDA_TOOLKIT_ROOT_DIR}/include) - include_directories (BEFORE "${CUDA_INCLUDES}") - -- STRING (FIND ${LLVM_TARGETS} "NVPTX" nvptx_index) -+ STRING (FIND "${LLVM_TARGETS_TO_BUILD}" "NVPTX" nvptx_index) - if (NOT ${nvptx_index} GREATER -1) - message (FATAL_ERROR "NVPTX target is not available in the provided LLVM build") - endif() -diff --git src/testshade/CMakeLists.txt src/testshade/CMakeLists.txt -index d99dd79ac..bfda2778a 100644 ---- src/testshade/CMakeLists.txt -+++ src/testshade/CMakeLists.txt -@@ -70,8 +70,8 @@ - set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR}) - list(APPEND include_dirs ${CMAKE_SOURCE_DIR}/src/include) - list(APPEND include_dirs ${CMAKE_BINARY_DIR}/include) --list(APPEND include_dirs ${IMATH_INCLUDES}) --list(APPEND include_dirs ${OpenImageIO_INCLUDES}) -+list(APPEND include_dirs ${Imath_INCLUDE_DIRS}) -+list(APPEND include_dirs ${OpenImageIO_INCLUDE_DIRS}) - - EMBED_LLVM_BITCODE_IN_CPP ( "${rs_srcs}" "_host" "testshade_llvm_compiled_rs" testshade_srcs "-DOSL_HOST_RS_BITCODE=1" "${include_dirs}") - diff --git a/packages/conan/recipes/osl/patches/1.14.7.0-find-llvm-binaries.patch_ALL_GONE b/packages/conan/recipes/osl/patches/1.14.7.0-find-llvm-binaries.patch_ALL_GONE deleted file mode 100644 index f217f230..00000000 --- a/packages/conan/recipes/osl/patches/1.14.7.0-find-llvm-binaries.patch_ALL_GONE +++ /dev/null @@ -1,14 +0,0 @@ -diff --git src/cmake/llvm_macros.cmake src/cmake/llvm_macros.cmake -index d99dd79ac..bfda2778a 100644 ---- src/cmake/llvm_macros.cmake -+++ src/cmake/llvm_macros.cmake -@@ -31,8 +31,7 @@ - if (NOT LLVM_BC_GENERATOR) - find_program (LLVM_BC_GENERATOR NAMES "clang++" - PATHS "${LLVM_DIRECTORY}/bin" "${LLVM_DIRECTORY}/tools/llvm" -- NO_CMAKE_PATH NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH -- NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH) -+ ) - endif () - - if (NOT LLVM_BC_GENERATOR)