diff options
| -rw-r--r-- | contrib/all.sh | 15 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-Clang.cmake | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/contrib/all.sh b/contrib/all.sh index e7bdd720..abab457e 100644 --- a/contrib/all.sh +++ b/contrib/all.sh @@ -32,19 +32,18 @@ run_test() { fi } -#cd "$(dirname -- "$0" || exit $?)" -cd f:/build/floormat +cd "$(dirname -- "$0" || exit $?)" +#cd f:/build/floormat #set -x configurations=' -clang64 clang -mingw64 gcc -msvc64 msvc-debug clang64 clang-asan - +msvc64 msvc-debug +mingw64 gcc-debug clang64 clang-release -msvc64 msvc +msvc64 msvc-release mingw64 gcc-release +clang64 clang-debug ' printf "%s\\n" "$configurations" | @@ -53,7 +52,7 @@ while read wrapper configs; do ( cd $i bprintf -- "***** Entering directory %s\\n" "$i" - "$wrapper" cmake c:/repos/floormat >/dev/null + "$wrapper" cmake ../.. >/dev/null if test $# -eq 0; then printf -- "> Running ninja for %s\\n" "$i" else diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake index 41b22e7d..196482ac 100644 --- a/userconfig-sthalik@Windows-Clang.cmake +++ b/userconfig-sthalik@Windows-Clang.cmake @@ -28,7 +28,7 @@ if(FLOORMAT_ASAN) add_link_options(-fsanitize=undefined,bounds,address) endif() -set(OpenCV_DIR "f:/build/opencv/build-clang-release-floormat/install" CACHE PATH "" FORCE) +set(OpenCV_DIR "d:/dev/opencv-floormat-clang-release" CACHE PATH "" FORCE) set(CMAKE_INSTALL_MESSAGE NEVER) sets(STRING |