diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-04-09 21:10:53 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-04-09 21:15:19 +0200 |
| commit | ba6cbb8d468f01ceb803cef7bab5902a2d410c2e (patch) | |
| tree | 5913501dcc788819f2220c37cc52dc59ac457af1 | |
| parent | 4439dcde7c04b01a546aedc1e2693439993d022c (diff) | |
workaround unconditional opencv enabling
This needs to be done better later.
| -rw-r--r-- | anim-crop-tool/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-GNU.cmake | 2 | ||||
| -rw-r--r-- | wall-tileset-tool/CMakeLists.txt | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/anim-crop-tool/CMakeLists.txt b/anim-crop-tool/CMakeLists.txt index 5f10df62..8dc63348 100644 --- a/anim-crop-tool/CMakeLists.txt +++ b/anim-crop-tool/CMakeLists.txt @@ -1,4 +1,6 @@ -find_package(OpenCV QUIET) +if(NOT DEFINED OpenCV_FOUND) + find_package(OpenCV QUIET) +endif() if(OpenCV_FOUND) set(self "floormat-anim-crop-tool") diff --git a/userconfig-sthalik@Windows-GNU.cmake b/userconfig-sthalik@Windows-GNU.cmake index 5c1b0d73..8735e5e4 100644 --- a/userconfig-sthalik@Windows-GNU.cmake +++ b/userconfig-sthalik@Windows-GNU.cmake @@ -61,7 +61,7 @@ function(fm-userconfig-external) MAGNUM_BUILD_PLUGINS_STATIC ON MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF ) - set(OpenCV_DIR "" CACHE STRING "" FORCE) + set(OpenCV_DIR "OpenCV_DIR-NOTFOUND" CACHE STRING "" FORCE) endif() endfunction() diff --git a/wall-tileset-tool/CMakeLists.txt b/wall-tileset-tool/CMakeLists.txt index 336af25b..8d73844d 100644 --- a/wall-tileset-tool/CMakeLists.txt +++ b/wall-tileset-tool/CMakeLists.txt @@ -1,4 +1,6 @@ -find_package(OpenCV QUIET) +if(NOT DEFINED OpenCV_FOUND) + find_package(OpenCV QUIET) +endif() if(OpenCV_FOUND) set(self "floormat-wall-tileset-tool") |