Debian Codegraph @

project/bundles/3rdparty/ext_lensfun/lensfun_fixbuild_vcpkg.patch

raw
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 75f0ae6a..0bf05711 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -94,7 +94,7 @@ IF(BUILD_FOR_SSE2)
6 ENDIF()
7 ENDIF()
8
9 -IF(WIN32)
10 +IF(0)
11 # base path for searching for glib on windows
12 IF(NOT GLIB2_BASE_DIR)
13 SET(GLIB2_BASE_DIR "${SOURCE_BASE_DIR}/glib-2.28.1" CACHE STRING "Base path of glib2 dir." FORCE)
14 @@ -116,7 +116,7 @@ ELSE()
15 FIND_PACKAGE(GLIB2 REQUIRED)
16 ENDIF()
17
18 -INCLUDE_DIRECTORIES(SYSTEM ${GLIB2_INCLUDE_DIRS})
19 +INCLUDE_DIRECTORIES(SYSTEM ${GLIB2_INCLUDE_DIR})
20 LINK_DIRECTORIES(${GLIB2_LIBRARY_DIRS})
21
22
23 @@ -193,7 +193,7 @@ IF(BUILD_DOC)
24 ADD_SUBDIRECTORY(docs)
25 ENDIF()
26
27 -IF(WIN32 AND NOT BUILD_STATIC)
28 +IF(0)
29 FIND_FILE(GLIB2_DLL
30 NAMES glib-2.0-0.dll glib-2.dll glib-2-vs9.dll
31 PATHS "${GLIB2_BASE_DIR}/bin"
32 @@ -221,7 +221,7 @@ MESSAGE(STATUS "Build with support for SSE2: ${BUILD_FOR_SSE2}")
33 MESSAGE(STATUS "Install helper scripts: ${INSTALL_HELPER_SCRIPTS}")
34 MESSAGE(STATUS "\nInstall prefix: ${CMAKE_INSTALL_PREFIX}")
35 MESSAGE(STATUS "\nUsing: ")
36 -MESSAGE(STATUS "GLIB2 include dir: ${GLIB2_INCLUDE_DIRS}")
37 +MESSAGE(STATUS "GLIB2 include dir: ${GLIB2_INCLUDE_DIR}")
38 MESSAGE(STATUS "GLIB2 library: ${GLIB2_LIBRARIES}")
39 IF(GLIB2_DLL)
40 MESSAGE(STATUS "GLIB2 DLL: ${GLIB2_DLL}")
41 diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
42 index db07ba27..f6bad1b1 100644
43 --- a/cmake/modules/FindGLIB2.cmake
44 +++ b/cmake/modules/FindGLIB2.cmake
45 @@ -1,70 +1,51 @@
46 -IF (NOT MSVC)
47 - FIND_PACKAGE(PkgConfig)
48 - PKG_SEARCH_MODULE(GLIB2 glib-2.0)
49 - IF(WIN32 AND NOT BUILD_STATIC)
50 - FIND_FILE(GLIB2_DLL
51 - NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll
52 - PATHS "${GLIB2_LIBRARY_DIRS}/../bin"
53 - NO_SYSTEM_ENVIRONMENT_PATH)
54 - ENDIF()
55 -ENDIF()
56 +# - Try to find the GLIB2 libraries
57 +# Once done this will define
58 +#
59 +# GLIB2_FOUND - system has glib2
60 +# GLIB2_INCLUDE_DIR - the glib2 include directory
61 +# GLIB2_LIBRARIES - glib2 library
62 +#
63 +# SPDX-FileCopyrightText: 2008 by Laurent Montel, <[email protected]>
64 +#
65 +# SPDX-License-Identifier: BSD-3-Clause
66 +#
67
68 -IF (NOT GLIB2_FOUND OR NOT PKG_CONFIG_FOUND)
69 - FIND_PATH(GLIB2_GLIB2CONFIG_INCLUDE_PATH
70 - NAMES glibconfig.h
71 - PATHS
72 - /usr/local/lib
73 - /usr/lib
74 - /usr/lib64
75 - /opt/local/lib
76 - ${GLIB2_BASE_DIR}/lib
77 - ${GLIB2_BASE_DIR}/include
78 - ${CMAKE_LIBRARY_PATH}
79 - PATH_SUFFIXES glib-2.0/include
80 - )
81 +if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
82 + # Already in cache, be silent
83 + set(GLIB2_FIND_QUIETLY TRUE)
84 +endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
85
86 +find_package(PkgConfig)
87 +pkg_check_modules(PC_LibGLIB2 QUIET glib-2.0)
88
89 - FIND_PATH(GLIB2_INCLUDE_DIRS
90 - NAMES glib.h
91 - PATHS
92 - /usr/local/include
93 - /usr/include
94 - /opt/local/include
95 - ${GLIB2_BASE_DIR}/include
96 - PATH_SUFFIXES gtk-2.0 glib-2.0 glib20
97 - )
98 +find_path(GLIB2_MAIN_INCLUDE_DIR
99 + NAMES glib.h
100 + HINTS ${PC_LibGLIB2_INCLUDEDIR}
101 + PATH_SUFFIXES glib-2.0)
102
103 - FIND_LIBRARY(GLIB2_LIBRARIES
104 - NAMES glib-2.0 glib20 glib
105 - PATHS
106 - /usr/local/lib
107 - /usr/lib
108 - /usr/lib64
109 - /opt/local/lib
110 - ${GLIB2_BASE_DIR}/lib
111 - )
112 -
113 - IF(GLIB2_GLIB2CONFIG_INCLUDE_PATH AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES)
114 - SET( GLIB2_INCLUDE_DIRS ${GLIB2_GLIB2CONFIG_INCLUDE_PATH} ${GLIB2_INCLUDE_DIRS} )
115 - SET( GLIB2_LIBRARIES ${GLIB2_LIBRARIES} )
116 - SET( GLIB2_FOUND 1 )
117 - ELSE()
118 - SET( GLIB2_INCLUDE_DIRS )
119 - SET( GLIB2_LIBRARIES )
120 - SET( GLIB2_FOUND 0)
121 - ENDIF()
122 -
123 - IF(WIN32 AND NOT BUILD_STATIC)
124 - FIND_FILE(GLIB2_DLL
125 - NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll
126 - PATHS "${GLIB2_BASE_DIR}/bin"
127 - NO_SYSTEM_ENVIRONMENT_PATH)
128 - ENDIF()
129 -ENDIF ()
130 +find_library(GLIB2_LIBRARY
131 + NAMES glib-2.0
132 + HINTS ${PC_LibGLIB2_LIBDIR}
133 +)
134
135 -#INCLUDE( FindPackageHandleStandardArgs )
136 -#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_GLIB2CONFIG_INCLUDE_PATH GLIB2_GLIB2_INCLUDE_PATH )
137 +set(GLIB2_LIBRARIES ${GLIB2_LIBRARY})
138
139 -IF (NOT GLIB2_FOUND AND GLIB2_FIND_REQUIRED)
140 - MESSAGE(FATAL_ERROR "Could not find glib2")
141 -ENDIF()
142 +# search the glibconfig.h include dir under the same root where the library is found
143 +get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
144 +
145 +find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
146 + PATH_SUFFIXES glib-2.0/include
147 + HINTS ${PC_LibGLIB2_INCLUDEDIR} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
148 +
149 +set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}")
150 +
151 +# not sure if this include dir is optional or required
152 +# for now it is optional
153 +if(GLIB2_INTERNAL_INCLUDE_DIR)
154 + set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}")
155 +endif(GLIB2_INTERNAL_INCLUDE_DIR)
156 +
157 +include(FindPackageHandleStandardArgs)
158 +find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR)
159 +
160 +mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)