]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/openexr/remove_find_package_macro.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / openexr / remove_find_package_macro.patch
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 111a603..109394f 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -25,22 +25,12 @@ endif()
6 project(OpenEXRMetaProject)
7
8
9 -# An "official" way to make this a super-project
10 -# basically overrides the find_package to not find anything
11 -# for stuff we're including locally
12 -set(as_subproject IlmBase OpenEXR)
13 -macro(find_package)
14 - if(NOT "${ARGV0}" IN_LIST as_subproject)
15 - _find_package(${ARGV})
16 - endif()
17 -endmacro()
18 -
19
20 # If you want to use ctest to configure, build and
21 # upload the results, cmake has builtin support for
22 # submitting to CDash, or any server who speaks the
23 # same protocol
24 -#
25 +#
26 # These settings will need to be set for your environment,
27 # and then a script such as the example in
28 #
29 @@ -51,7 +41,7 @@ endmacro()
30 # cmake -S cmake/SampleCTestScript.cmake
31 #
32 # [or whatever you name the file you edit]
33 -#
34 +#
35 #set(CTEST_PROJECT_NAME "OpenEXR")
36 #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC")
37 #set(CTEST_DROP_METHOD "http") # there are others...
38 diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt
39 index 390b27f..87b2d01 100644
40 --- a/OpenEXR/CMakeLists.txt
41 +++ b/OpenEXR/CMakeLists.txt
42 @@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake)
43
44 # Everyone depends on IlmBase, and we currently rely on
45 # the version matched with our release
46 -find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG)
47
48 # generates config headers, package config files
49 add_subdirectory(config)
50 diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake
51 index 5116726..34c7c87 100644
52 --- a/OpenEXR/config/OpenEXRSetup.cmake
53 +++ b/OpenEXR/config/OpenEXRSetup.cmake
54 @@ -33,7 +33,7 @@ endif()
55 # Whether to build & install the various command line utility programs
56 option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON)
57
58 -# This is a variable here for use in controlling where include files are
59 +# This is a variable here for use in controlling where include files are
60 # installed. Care must be taken when changing this, as many things
61 # probably assume this is OpenEXR
62 set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install")
63 diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt
64 index 5efa353..5246fa7 100644
65 --- a/OpenEXR_Viewers/CMakeLists.txt
66 +++ b/OpenEXR_Viewers/CMakeLists.txt
67 @@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION})
68 #######################################
69 include(config/OpenEXRViewersSetup.cmake)
70
71 -find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG)
72 -find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG)
73
74 # This is for newer cmake versions who know about vendor versions
75 set(OpenGL_GL_PREFERENCE GLVND)
76 diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt
77 index 291b96e..7d5074f 100644
78 --- a/PyIlmBase/CMakeLists.txt
79 +++ b/PyIlmBase/CMakeLists.txt
80 @@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX)
81 include(config/PyIlmBaseSetup.cmake)
82
83 # we have a strong dependence on IlmBase being an exact match
84 -find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG)
85
86 # we are building a python extension, so of course we depend on
87 # python as well. Except we don't know which version...