From b6c6669e9a5ee0bfea95784177d7bf4cc3d3b3bc Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Wed, 31 Jul 2024 21:37:01 +0200
Subject: [PATCH] FIX: Update make doc for Conan 2

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9c8fb41..fb07368 100644
--- a/Makefile
+++ b/Makefile
@@ -79,11 +79,12 @@ conan-create-debug:
 conan: conan-install-deps conan-create
 .PHONY: conan
 
-doc:
+doc: conan-install-deps
 	@doxygen --version || ( echo "Doxygen not found.  Please install Doxygen first." ; exit 1 )
-	mkdir -p build && cd build && conan install .. --build=missing -s $(CONAN_SETTINGS) \
-	  && cmake .. && cmake --build . --target doc-sphinx \
-	  && echo "The documentation starts at build/doc/sphinx_out/index.html ."
+	cd build/Release\
+	  && cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE="generators/conan_toolchain.cmake" -DCMAKE_INSTALL_PREFIX="/home/joscha/caosdb/src/caosdb-cpplib" -DCMAKE_POLICY_DEFAULT_CMP0091="NEW" -DCMAKE_BUILD_TYPE="Release" ../.. \
+	  && cmake --build . --target doc-sphinx \
+	  && echo "The documentation starts at build/Release/doc/sphinx_out/index.html ."
 .PHONY: doc
 
 conan-debug: conan-install-debug conan-create-debug
-- 
GitLab