Merge branch 'dev' into f-mixed-write-transactions

CHANGELOG.md

@@ -23,5 +23,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 * #11 - Transaction::GetResultSet() now always returns a valid reference.
+* #25 - Compiles on MacOS with LLVM now.
 
 ### Security

CMakeLists.txt

@@ -63,6 +63,8 @@ string(REGEX REPLACE "grpc\\+?\\+?_unsecure" "" CONAN_LIBS
 string(REGEX REPLACE "grpc\\+?\\+?_unsecure" "" CONAN_PKG_LIBS
     "${CONAN_PKG_LIBS}")
 
+message(STATUS "CONAN_LIBS: ${CONAN_LIBS}")
+
 ###########################################
 ### GENERAL SETUP of SOURCES
 ###########################################

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

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"
 

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=17"`
 
 and continue as you would when building on a Linux system. You may
 have to add `build/lib/` (or, alternatively after installation,
@@ -37,7 +37,8 @@ variable.
 #### Problems and solutions ####
 
 - Make sure that your conan version supports your XCode version.  A typical symptom of version
-  mismatch is for example conan complaining about incompatible `compiler.version` settings.
+  mismatch is for example conan complaining about incompatible `compiler.version` settings.  You may
+  need to rerun any conan and cmake commands (and delete cache files first) after compiler updates.
 
 ### How to build on Windows
 

src/caosdb/file_transmission/file_reader.cpp

@@ -59,7 +59,7 @@ FileReader::FileReader(boost::filesystem::path filename)
 }
 
 void FileReader::openFile() {
-  stream_.open(filename_, std::ios::binary | std::ios::ate);
+  stream_.open(filename_.generic_string(), std::ios::binary | std::ios::ate);
   if (!stream_) {
     throw FileIOError("Can't open file for reading: " + filename_.string());
   }

src/caosdb/file_transmission/file_writer.cpp

@@ -58,7 +58,7 @@ FileWriter::FileWriter(boost::filesystem::path filename) : filename_(std::move(f
 }
 
 void FileWriter::openFile() {
-  stream_.open(filename_, std::ios::binary | std::ios::trunc);
+  stream_.open(filename_.generic_string(), std::ios::binary | std::ios::trunc);
   if (!stream_) {
     throw FileIOError("Can't open file for writing: " + filename_.string());
   }