[delaunay-psm] Update to 1.6.0

Author: simogasp

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1.3)
 
-project(delaunay-psm LANGUAGES C CXX VERSION 1.5.6)
+project(delaunay-psm LANGUAGES C CXX VERSION 1.6.0)
 
 set(CMAKE_CXX_STANDARD 11)
 

delaunay-psm/Delaunay_psm.cpp

@@ -1987,6 +1987,8 @@ namespace {
     using namespace GEO;
     using namespace CmdLine;
 
+    std::string config_file_name = "geogram.ini";
+    
     int geo_argc = 0;
     char** geo_argv = nil;
 
@@ -2121,12 +2123,14 @@ namespace {
 	    return;
 	}
 	init = true;
-	Logger::out("geogram.ini") << "Home directory:" << FileSystem::home_directory()
-				   << std::endl;
-	std::string config_filename = FileSystem::home_directory() + "/geogram.ini";
+	Logger::out("config") << "Configuration file name:" << config_file_name
+			      << std::endl;
+	Logger::out("config") << "Home directory:" << FileSystem::home_directory()
+			      << std::endl;
+	std::string config_filename = FileSystem::home_directory() + "/" + config_file_name;
 	std::string section = "*";
 	if(FileSystem::is_file(config_filename)) {
-	    Logger::out("geogram.ini") << "Using configuration file:"
+	    Logger::out("config") << "Using configuration file:"
 				       << config_filename
 				       << std::endl;
 	    std::ifstream in(config_filename.c_str());
@@ -2142,7 +2146,7 @@ namespace {
 			if(CmdLine::arg_is_declared(argname)) {
 			    CmdLine::set_arg(argname, argval);
 			} else {
-			    Logger::warn("geogram.ini") << argname << "=" << argval << " ignored" << std::endl;
+			    Logger::warn("config") << argname << "=" << argval << " ignored" << std::endl;
 			}
 		    }
 		}
@@ -2342,6 +2346,14 @@ namespace GEO {
 	char** argv() {
 	    return geo_argv;
 	}
+
+	void set_config_file_name(const std::string& filename) {
+	    config_file_name = filename;
+	}
+
+	std::string get_config_file_name() {
+	    return config_file_name;
+	}
 
         bool parse(
             int argc, char** argv, std::vector<std::string>& unparsed_args,
@@ -3481,7 +3493,7 @@ namespace {
 	);
 	declare_arg(
 	    "poly:generate_ids", false,
-	    "generate unique ids for vertices and cells (saved in geogram and geogram_ascii file formats only)"
+	    "generate unique ids for vertices and cells (saved in geogram, geogram_ascii and ovm file formats only)"
 	);
 	declare_arg(
 	    "poly:embedding_dim", 0,

delaunay-psm/Delaunay_psm.h

@@ -283,7 +283,7 @@ namespace GEO {
 #define GEO_NORETURN_DECL 
 #endif
 
-#if defined(GEO_COMPILER_CLANG)
+#if defined(GEO_COMPILER_CLANG) || defined(GEO_COMPILER_EMSCRIPTEN)
 #if __has_feature(cxx_noexcept)
 #define GEO_NOEXCEPT noexcept
 #endif
@@ -5114,6 +5114,11 @@ namespace GEO {
 
         void GEOGRAM_API terminate();
 
+
+	void GEOGRAM_API set_config_file_name(const std::string& filename);
+
+	std::string GEOGRAM_API get_config_file_name();
+	
         enum ArgType {
 
             ARG_UNDEFINED = 0,