Skip to content
Snippets Groups Projects
Commit 331d8404 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Should compile and link on MacOS now.

parent 3d72f4be
No related branches found
No related tags found
1 merge request!29FIX: Explicit bfs:path conversion to string.
Pipeline #14167 passed
Pipeline: caosdb-cppinttest

#14173

    ......@@ -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
    ......
    ......@@ -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"
    ......
    ......@@ -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,
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment