Again, avoid crazy excaping for empty path quotes.

BRL-CAD · Jan 24, 2024 · 4c5d581 · 4c5d581
1 parent c9feaf9
commit 4c5d581
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
@@ -38,7 +38,6 @@ if (ENABLE_OPENCV)
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR}
-    -DOPENCV_INSTALL_BINARIES_PREFIX=\\\"\\\"
     -DOPENCV_CONFIG_INSTALL_PATH=${LIB_DIR}/cmake/opencv4
     -DOPENCV_SETUPVARS_INSTALL_PATH=${BIN_DIR}
     -DOPENCV_SKIP_CMAKE_ROOT_CONFIG=ON

diff --git a/opencv/opencv.patch b/opencv/opencv.patch
@@ -1,6 +1,6 @@
-diff -Naur opencv-4.8.0/cmake/FindPNG.cmake opencv/cmake/FindPNG.cmake
---- opencv-4.8.0/cmake/FindPNG.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ opencv/cmake/FindPNG.cmake	2023-09-15 10:45:04.898760249 -0400
+diff -Naur opencv/cmake/FindPNG.cmake OPENCV_BLD/cmake/FindPNG.cmake
+--- opencv/cmake/FindPNG.cmake	1969-12-31 19:00:00.000000000 -0500
++++ OPENCV_BLD/cmake/FindPNG.cmake	2024-01-24 11:22:41.584210390 -0500
 @@ -0,0 +1,190 @@
 +# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 +# file Copyright.txt or https://cmake.org/licensing for details.
@@ -192,9 +192,9 @@ diff -Naur opencv-4.8.0/cmake/FindPNG.cmake opencv/cmake/FindPNG.cmake
 +# indent-tabs-mode: t
 +# End:
 +# ex: shiftwidth=2 tabstop=8
-diff -Naur opencv-4.8.0/cmake/FindZLIB.cmake opencv/cmake/FindZLIB.cmake
---- opencv-4.8.0/cmake/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ opencv/cmake/FindZLIB.cmake	2023-09-15 10:21:10.116229212 -0400
+diff -Naur opencv/cmake/FindZLIB.cmake OPENCV_BLD/cmake/FindZLIB.cmake
+--- opencv/cmake/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
++++ OPENCV_BLD/cmake/FindZLIB.cmake	2024-01-24 11:22:41.584210390 -0500
 @@ -0,0 +1,123 @@
 +#.rst:
 +# FindZLIB
@@ -319,9 +319,30 @@ diff -Naur opencv-4.8.0/cmake/FindZLIB.cmake opencv/cmake/FindZLIB.cmake
 +        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
 +    endif()
 +endif()
-diff -Naur opencv-4.8.0/CMakeLists.txt opencv/CMakeLists.txt
---- opencv-4.8.0/CMakeLists.txt	2023-09-15 10:46:52.339250212 -0400
-+++ opencv/CMakeLists.txt	2023-09-15 10:21:10.118229202 -0400
+diff -Naur opencv/cmake/OpenCVInstallLayout.cmake OPENCV_BLD/cmake/OpenCVInstallLayout.cmake
+--- opencv/cmake/OpenCVInstallLayout.cmake	2024-01-24 11:26:57.523479289 -0500
++++ OPENCV_BLD/cmake/OpenCVInstallLayout.cmake	2024-01-24 11:26:23.392100252 -0500
+@@ -22,12 +22,12 @@
+
+ elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+
+-  if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
+-    ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+-  else()
+-    message(STATUS "Can't detect runtime and/or arch")
++	#if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
++	#ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
++	#else()
++	#message(STATUS "Can't detect runtime and/or arch")
+     ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "")
+-  endif()
++	#endif()
+   if(OpenCV_STATIC)
+     ocv_update(OPENCV_INSTALL_BINARIES_SUFFIX "staticlib")
+   else()
+diff -Naur opencv/CMakeLists.txt OPENCV_BLD/CMakeLists.txt
+--- opencv/CMakeLists.txt	2024-01-24 11:26:57.231484592 -0500
++++ OPENCV_BLD/CMakeLists.txt	2024-01-24 11:22:41.584210390 -0500
 @@ -14,6 +14,7 @@
  ")
  endif()