Removed
Link Here
|
1 |
--- cmake/FindIlmBase.cmake.orig 2021-06-11 21:38:41 UTC |
2 |
+++ cmake/FindIlmBase.cmake |
3 |
@@ -10,7 +10,7 @@ Find IlmBase include dirs and libraries |
4 |
|
5 |
Use this module by invoking find_package with the form:: |
6 |
|
7 |
- find_package(IlmBase |
8 |
+ find_package(Imath |
9 |
[version] [EXACT] # Minimum or EXACT version |
10 |
[REQUIRED] # Fail with error if IlmBase is not found |
11 |
[COMPONENTS <libs>...] # IlmBase libraries by their canonical name |
12 |
@@ -36,11 +36,11 @@ Result Variables |
13 |
|
14 |
This will define the following variables: |
15 |
|
16 |
-``IlmBase_FOUND`` |
17 |
- True if the system has the IlmBase library. |
18 |
+``Imath_FOUND`` |
19 |
+ True if the system has the Imath library. |
20 |
``IlmBase_VERSION`` |
21 |
The version of the IlmBase library which was found. |
22 |
-``IlmBase_INCLUDE_DIRS`` |
23 |
+``S`` |
24 |
Include directories needed to use IlmBase. |
25 |
``IlmBase_RELEASE_LIBRARIES`` |
26 |
Libraries needed to link to the release version of IlmBase. |
27 |
@@ -65,7 +65,7 @@ Cache Variables |
28 |
|
29 |
The following cache variables may also be set: |
30 |
|
31 |
-``IlmBase_INCLUDE_DIR`` |
32 |
+```` |
33 |
The directory containing ``IlmBase/config-auto.h``. |
34 |
``IlmBase_{COMPONENT}_LIBRARY`` |
35 |
Individual component libraries for IlmBase. may include target_link_libraries() debug/optimized keywords. |
36 |
@@ -102,7 +102,7 @@ include(GNUInstallDirs) |
37 |
|
38 |
|
39 |
mark_as_advanced( |
40 |
- IlmBase_INCLUDE_DIR |
41 |
+ |
42 |
IlmBase_LIBRARY |
43 |
) |
44 |
|
45 |
@@ -112,10 +112,6 @@ if(DISABLE_CMAKE_SEARCH_PATHS) |
46 |
endif() |
47 |
|
48 |
set(_ILMBASE_COMPONENT_LIST |
49 |
- Half |
50 |
- Iex |
51 |
- IexMath |
52 |
- IlmThread |
53 |
Imath |
54 |
) |
55 |
|
56 |
@@ -177,15 +173,15 @@ list(APPEND _ILMBASE_INCLUDE_SEARCH_DIRS |
57 |
) |
58 |
|
59 |
# Look for a standard IlmBase header file. |
60 |
-find_path(IlmBase_INCLUDE_DIR IlmBaseConfig.h |
61 |
+find_path( IlmBaseConfig.h |
62 |
${_FIND_ILMBASE_ADDITIONAL_OPTIONS} |
63 |
PATHS ${_ILMBASE_INCLUDE_SEARCH_DIRS} |
64 |
PATH_SUFFIXES ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR include/OpenEXR OpenEXR |
65 |
) |
66 |
|
67 |
-if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h") |
68 |
+if(EXISTS "${}/IlmBaseConfig.h") |
69 |
# Get the ILMBASE version information from the config header |
70 |
- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h" |
71 |
+ file(STRINGS "${}/IlmBaseConfig.h" |
72 |
_ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR " |
73 |
) |
74 |
string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" |
75 |
@@ -193,7 +189,7 @@ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h") |
76 |
) |
77 |
string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR) |
78 |
|
79 |
- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h" |
80 |
+ file(STRINGS "${}/IlmBaseConfig.h" |
81 |
_ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR " |
82 |
) |
83 |
string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" |
84 |
@@ -324,16 +320,16 @@ endforeach() |
85 |
# ------------------------------------------------------------------------ |
86 |
|
87 |
include(FindPackageHandleStandardArgs) |
88 |
-find_package_handle_standard_args(IlmBase |
89 |
- FOUND_VAR IlmBase_FOUND |
90 |
+find_package_handle_standard_args(Imath |
91 |
+ FOUND_VAR Imath_FOUND |
92 |
REQUIRED_VARS |
93 |
- IlmBase_INCLUDE_DIR |
94 |
- IlmBase_LIB_COMPONENTS |
95 |
- VERSION_VAR IlmBase_VERSION |
96 |
+# IlmBase_INCLUDE_DIR |
97 |
+ Imath_LIB_COMPONENTS |
98 |
+ VERSION_VAR Imath_VERSION |
99 |
HANDLE_COMPONENTS |
100 |
) |
101 |
|
102 |
-if(NOT IlmBase_FOUND) |
103 |
+if(NOT Imath_FOUND) |
104 |
if(IlmBase_FIND_REQUIRED) |
105 |
message(FATAL_ERROR "Unable to find IlmBase") |
106 |
endif() |
107 |
@@ -348,8 +344,8 @@ set(IlmBase_DEBUG_LIBRARIES "") |
108 |
set(IlmBase_DEBUG_LIBRARY_DIRS "") |
109 |
foreach(LIB ${IlmBase_LIB_COMPONENTS_RELEASE}) |
110 |
get_filename_component(_ILM_LIBDIR ${LIB} DIRECTORY) |
111 |
- list(APPEND IlmBase_RELEASE_LIBRARIES ${LIB}) |
112 |
- list(APPEND IlmBase_RELEASE_LIBRARY_DIRS ${_ILM_LIBDIR}) |
113 |
+ list(APPEND Imath_RELEASE_LIBRARIES ${LIB}) |
114 |
+ list(APPEND Imath_RELEASE_LIBRARY_DIRS ${_ILM_LIBDIR}) |
115 |
endforeach() |
116 |
|
117 |
foreach(LIB ${IlmBase_LIB_COMPONENTS_DEBUG}) |
118 |
@@ -377,12 +373,12 @@ set(IlmBase_LIBRARY_DIRS ${IlmBase_RELEASE_LIBRARY_DIR |
119 |
|
120 |
set(_IlmBase_Parent_Dir "") |
121 |
get_filename_component(_IlmBase_Parent_Dir |
122 |
- ${IlmBase_INCLUDE_DIR}/../ ABSOLUTE) |
123 |
+ ${}/../ ABSOLUTE) |
124 |
|
125 |
-set(IlmBase_INCLUDE_DIRS) |
126 |
-list(APPEND IlmBase_INCLUDE_DIRS |
127 |
+set(S) |
128 |
+list(APPEND S |
129 |
${_IlmBase_Parent_Dir} |
130 |
- ${IlmBase_INCLUDE_DIR} |
131 |
+ ${} |
132 |
) |
133 |
unset(_IlmBase_Parent_Dir) |
134 |
|
135 |
@@ -419,7 +415,7 @@ foreach(COMPONENT ${IlmBase_FIND_COMPONENTS}) |
136 |
set_target_properties(IlmBase::${COMPONENT} PROPERTIES |
137 |
INTERFACE_COMPILE_OPTIONS "${PC_IlmBase_CFLAGS_OTHER}" |
138 |
INTERFACE_COMPILE_DEFINITIONS "${IlmBase_${COMPONENT}_DEFINITIONS}" |
139 |
- INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}") |
140 |
+ INTERFACE_INCLUDE_DIRECTORIES "${S}") |
141 |
|
142 |
# Standard location |
143 |
set_target_properties(IlmBase::${COMPONENT} PROPERTIES |