From 331d8404139ea58f98a1e2899b683bced443a821 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Mon, 27 Sep 2021 13:40:46 +0200
Subject: [PATCH] FIX: Should compile and link on MacOS now.
---
Makefile | 4 ++--
conanfile.py | 6 +++++-
doc/README_SETUP.md | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 367c0de..819b9ca 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ else
DETECTED_OS := $(patsubst MINGW%,MSYS,$(DETECTED_OS))
endif
ifeq ($(DETECTED_OS),Darwin) # Test if we are on MacOS
- CONAN_SETTINGS := "cppstd=11"
+ CONAN_SETTINGS := "compiler.cppstd=17"
endif
@@ -53,7 +53,7 @@ style:
.PHONY: style
conan-install:
- conan install . -s $(CONAN_SETTINGS) || \
+ conan install . -s $(CONAN_SETTINGS) || \
(echo "'conan install' failed, trying to build from sources..."; \
conan install . -s $(CONAN_SETTINGS) --build=missing)
.PHONY: conan-install
diff --git a/conanfile.py b/conanfile.py
index 7a712bb..b7b2cd5 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -13,7 +13,11 @@ class CaosdbConan(ConanFile):
options = {"shared": [True, False], "fPIC": [True, False]}
default_options = {"shared": False, "fPIC": True}
generators = "cmake"
- requires = [("boost/1.76.0"), ("gtest/1.11.0"), ("grpc/1.38.0")]
+ requires = [
+ ("boost/1.76.0"),
+ ("gtest/1.11.0"),
+ ("grpc/1.38.0"),
+ ]
exports = "*.cpp", "*.h", "*.cmake", "*CMakeLists.txt", "*.in", "*.proto", "*.c"
exports_sources = "src", "doc", "include", "test", "cmake", "proto"
diff --git a/doc/README_SETUP.md b/doc/README_SETUP.md
index 46026ee..50e0032 100644
--- a/doc/README_SETUP.md
+++ b/doc/README_SETUP.md
@@ -27,7 +27,7 @@ command (3.).
Instead of the above conan command (2.) use
-2. `conan install .. -s "cppstd=11"`
+2. `conan install .. -s "compiler.cppstd=11"`
and continue as you would when building on a Linux system. You may
have to add `build/lib/` (or, alternatively after installation,
--
GitLab