summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-07-01 15:19:33 +0200
committerStanislaw Halik <sthalik@misaki.pl>2024-07-01 15:19:33 +0200
commitc654a84de90743dc53bb872b9099dbbe08e56061 (patch)
treee562ae6be9c932b86f2c7fec4f98b8434b998d00
parent86c06037da81f1033a3a36a3523d8d21d1f34ead (diff)
add my paths after windows reinstall
-rw-r--r--userconfig-sthalik@Windows-Clang.cmake2
-rw-r--r--userconfig-sthalik@Windows-GNU.cmake3
-rw-r--r--userconfig-sthalik@Windows-MSVC.cmake2
3 files changed, 4 insertions, 3 deletions
diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake
index ae71157f..28ace9f0 100644
--- a/userconfig-sthalik@Windows-Clang.cmake
+++ b/userconfig-sthalik@Windows-Clang.cmake
@@ -26,7 +26,7 @@ if(FLOORMAT_ASAN)
add_link_options(-fsanitize=undefined,bounds,address)
endif()
-set(OpenCV_DIR "f:/dev/opentrack-depends/opencv/build-clang-amd64/install" CACHE PATH "" FORCE)
+set(OpenCV_DIR "f:/build/opencv/build-clang-release-floormat/install" CACHE PATH "" FORCE)
set(CMAKE_INSTALL_MESSAGE NEVER)
sets(STRING
diff --git a/userconfig-sthalik@Windows-GNU.cmake b/userconfig-sthalik@Windows-GNU.cmake
index a347ea8e..81d99338 100644
--- a/userconfig-sthalik@Windows-GNU.cmake
+++ b/userconfig-sthalik@Windows-GNU.cmake
@@ -15,15 +15,16 @@ list(APPEND CMAKE_IGNORE_PREFIX_PATH "c:/msys64" "c:/msys64/clang64")
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fconcepts-diagnostics-depth=3>)
add_compile_options(-fdiagnostics-color=always)
-set(OpenCV_DIR "f:/dev/opentrack-depends/opencv/build-gcc/install" CACHE PATH "" FORCE)
add_compile_options(-fstack-usage -Wstack-usage=16384)
if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
add_definitions(-D_GLIBCXX_ASSERTIONS)
add_definitions(-D_GLIBCXX_USE_DEPRECATED=0 -D_GLIBCXX_USE_CXX11_ABI)
add_definitions(-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC)
+ set(OpenCV_DIR "f:/build/opencv/build-gcc-debug-floormat/install" CACHE PATH "" FORCE)
else()
set(BUILD_SHARED_LIBS OFF)
+ set(OpenCV_DIR "f:/build/opencv/build-gcc-release-floormat/install" CACHE PATH "" FORCE)
endif()
add_compile_definitions("$<$<CONFIG:Debug,DEBUG>:_FORTIFY_SOURCE=3>")
add_compile_definitions("$<IF:$<CONFIG:Debug,DEBUG>,,_FORTIFY_SOURCE=3>")
diff --git a/userconfig-sthalik@Windows-MSVC.cmake b/userconfig-sthalik@Windows-MSVC.cmake
index c721de1a..bf44f7bb 100644
--- a/userconfig-sthalik@Windows-MSVC.cmake
+++ b/userconfig-sthalik@Windows-MSVC.cmake
@@ -12,7 +12,7 @@ if(NOT DEFINED OpenCV_DIR)
#set(OpenCV_DIR "F:/dev/opentrack-depends/opencv/build-msvc64-debug/install" CACHE PATH "" FORCE)
sets(PATH OpenCV_DIR "")
else()
- set(OpenCV_DIR "F:/dev/opentrack-depends/opencv/build-amd64/install" CACHE PATH "" FORCE)
+ set(OpenCV_DIR "F:/build/opencv/build-msvc-release-floormat/install" CACHE PATH "" FORCE)
endif()
endif()