update ceph source to reef 18.1.2

[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / collada-dom / use-uriparser.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt\r
index 3ec1527..3f044d3 100644\r
--- a/CMakeLists.txt\r
+++ b/CMakeLists.txt\r
@@ -237,23 +237,29 @@ else()\r
   set(MINIZIP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dom/external-libs/minizip-1.1 ${ZLIB_INCLUDE_DIR})\r
 endif()\r
 \r
-pkg_check_modules(liburiparser liburiparser)\r
-\r
-if(liburiparser_FOUND)\r
-  set(liburiparser_CFLAGS_OTHERS "-DUSE_URIPARSER")\r
+find_package(UriParser)\r
+if(URIPARSER_FOUND)\r
+  set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER")\r
+  set(URIPARSER_LIBRARIES ${URIPARSER_LIBRARY})\r
+  message(STATUS "liburiparser found")\r
 else()\r
-  # try using pcrecpp\r
-  pkg_check_modules(libpcrecpp libpcrecpp)\r
-  if( libpcrecpp_FOUND )\r
+  pkg_check_modules(liburiparser liburiparser)\r
+  if(liburiparser_FOUND)\r
+    set(URIPARSER_CFLAGS_OTHERS "-DUSE_URIPARSER")\r
+    message(STATUS "liburiparser found")\r
+  else()\r
+    # try using pcrecpp\r
+    pkg_check_modules(libpcrecpp libpcrecpp)\r
+    if( libpcrecpp_FOUND )\r
     set(CMAKE_REQUIRED_INCLUDES ${libpcrecpp_INCLUDE_DIRS})\r
     check_include_file_cxx(pcrecpp.h HAVE_PCRECPP_H)\r
     set(CMAKE_REQUIRED_INCLUDES)\r
     if( NOT HAVE_PCRECPP_H )\r
-      set(libpcrecpp_FOUND 0)\r
+        set(libpcrecpp_FOUND 0)\r
+    endif()\r
     endif()\r
-  endif()\r
 \r
-  if( NOT libpcrecpp_FOUND )\r
+    if( NOT libpcrecpp_FOUND )\r
     message(STATUS "System pcre not found, using local from sources")\r
     # include the local pcre\r
     add_subdirectory(dom/external-libs/pcre-8.02)\r
@@ -262,6 +268,7 @@ else()\r
     set(libpcrecpp_LIBRARIES pcrecpp_local)\r
     set(libpcrecpp_CFLAGS_OTHERS "-DPCRE_STATIC")\r
     set(libpcrecpp_LDFLAGS_OTHERS)\r
+    endif()\r
   endif()\r
 endif()\r
 \r
diff --git a/cmake-modules/FindUriParser.cmake b/cmake-modules/FindUriParser.cmake\r
new file mode 100644\r
index 0000000..91f466b\r
--- /dev/null\r
+++ b/cmake-modules/FindUriParser.cmake\r
@@ -0,0 +1,35 @@\r
+# Find the UriParser library\r
+# Defines:\r
+\r
+#  URIPARSER_INCLUDE_DIR - uriparser include directory\r
+#  URIPARSER_LIBRARY     - uriparser library file\r
+#  URIPARSER_FOUND       - TRUE if uriparser is found\r
+\r
+if (URIPARSER_INCLUDE_DIR)\r
+ #check cache \r
+  set(URIPARSER_FIND_QUIETLY TRUE)\r
+endif ()\r
+\r
+if (NOT URIPARSER_INCLUDE_DIR)\r
+    find_path(URIPARSER_INCLUDE_DIR NAMES Uri.h PATH_SUFFIXES uriparser)\r
+    set(URIPARSER_INCLUDE_DIR ${URIPARSER_INCLUDE_DIR}/uriparser CACHE PATH "uriparser includes")\r
+endif ()\r
+\r
+find_library(URIPARSER_LIBRARY NAMES uriparser)\r
+\r
+if (URIPARSER_INCLUDE_DIR AND URIPARSER_LIBRARY)\r
+  set(URIPARSER_FOUND TRUE)\r
+  set(UriParser_FOUND TRUE)\r
+endif ()\r
+\r
+if (URIPARSER_FOUND)\r
+   if (NOT URIPARSER_FIND_QUIETLY)\r
+      message(STATUS "Found UriParser library: ${URIPARSER_LIBRARY}")\r
+   endif ()\r
+else ()\r
+   if (NOT URIPARSER_FIND_QUIETLY)\r
+      message(FATAL_ERROR "Could NOT find UriParser library")\r
+    else ()\r
+      message(STATUS "Could NOT find UriParser library")\r
+    endif ()\r
+endif ()\r
diff --git a/dom/CMakeLists.txt b/dom/CMakeLists.txt\r
index f7ffb27..62e1b8a 100644\r
--- a/dom/CMakeLists.txt\r
+++ b/dom/CMakeLists.txt\r
@@ -1,6 +1,6 @@\r
 set(COLLADA_INTERNAL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include)\r
 include_directories(${COLLADA_INTERNAL_INCLUDE})\r
-set(COLLADA_LIBS minizip ${liburiparser_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})\r
+set(COLLADA_LIBS minizip ${URIPARSER_LIBRARIES} ${libpcrecpp_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})\r
 \r
 file(GLOB dae_files ${CMAKE_CURRENT_SOURCE_DIR}/src/dae/*.cpp)\r
 if( LIBXML2_FOUND )\r
@@ -13,7 +13,7 @@ file(GLOB stddatabase_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/STLDatabase/\r
 file(GLOB stderrplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/stdErrPlugin/*.cpp)\r
 \r
 set(COLLADA_BASE_SOURCES ${dae_files} ${libxmlplugin_files} ${stddatabase_files} ${stderrplugin_files})\r
-set(COLLADA_COMPILE_FLAGS "${liburiparser_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}")\r
+set(COLLADA_COMPILE_FLAGS "${URIPARSER_CFLAGS_OTHERS} ${libpcrecpp_CFLAGS_OTHERS} ${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS}")\r
 # create dynamic libraries\r
 set(COLLADA_COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS} -DDOM_DYNAMIC -DDOM_EXPORT")\r
 \r
diff --git a/dom/src/dae/daeURI.cpp b/dom/src/dae/daeURI.cpp\r
index 3a8f815..1623753 100644\r
--- a/dom/src/dae/daeURI.cpp\r
+++ b/dom/src/dae/daeURI.cpp\r
@@ -790,7 +790,7 @@ bool cdom::parseUriRef(const string& uriRef,\r
         scheme = fromRange(uri.scheme);\r
         authority = fromRange(uri.hostText);\r
         path = fromList(uri.pathHead, "/");\r
-        if (uri.absolutePath != URI_TRUE and uri.hostText.first == NULL)\r
+        if (uri.absolutePath != URI_TRUE && uri.hostText.first == NULL)\r
             path = path.erase(0, 1);\r
         query = fromRange(uri.query);\r
         fragment = fromRange(uri.fragment);\r