[geogram] Update to 1.6.7

adrelino · Sep 7, 2018 · 0ac4a58 · 0ac4a58
1 parent 4bc6dc2
commit 0ac4a58
Show file tree

Hide file tree

Showing 141 changed files with 17,354 additions and 4,127 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,24 +22,27 @@ endif()
 # Optional modules
 # (can be overriden in CMakeOptions.txt)
 
-option(GEOGRAM_WITH_GRAPHICS "Viewers and geogram_gfx library" ON)
-option(GEOGRAM_WITH_LEGACY_NUMERICS "Legacy numerical libraries" ON)
-option(GEOGRAM_WITH_HLBFGS "Non-linear solver (Yang Liu's HLBFGS)" ON)
-option(GEOGRAM_WITH_TETGEN "Tetrahedral mesher (Hang Si's TetGen)" ON)
-option(GEOGRAM_WITH_TRIANGLE "Triangle mesher (Jonathan Shewchuk's triangle)" ON)
-option(GEOGRAM_WITH_EXPLORAGRAM "Experimental code (hexahedral meshing pipeline and optimal transport)" ON)
-option(GEOGRAM_WITH_LUA "Built-in LUA interpreter" ON)
-option(GEOGRAM_LIB_ONLY "Libraries only (no example programs/no viewer)" OFF)
-option(GEOGRAM_WITH_FPG "Predicate generator (Sylvain Pion's FPG)" OFF)
-option(GEOGRAM_USE_SYSTEM_GLFW3 "Use the version of GLFW3 installed in the system if found" OFF)
-
-set(VORPALINE_PLATFORM "" CACHE STRING "")
+# Set GEOGRAM_SUB_BUILD if Geogram sources included in buildtree, then
+# VORPALINE_PLATFORM can be set directly in parent CMakeLists.txt
+if(NOT GEOGRAM_SUB_BUILD)
+   option(GEOGRAM_WITH_GRAPHICS "Viewers and geogram_gfx library" ON)
+   option(GEOGRAM_WITH_LEGACY_NUMERICS "Legacy numerical libraries" ON)
+   option(GEOGRAM_WITH_HLBFGS "Non-linear solver (Yang Liu's HLBFGS)" ON)
+   option(GEOGRAM_WITH_TETGEN "Tetrahedral mesher (Hang Si's TetGen)" ON)
+   option(GEOGRAM_WITH_TRIANGLE "Triangle mesher (Jonathan Shewchuk's triangle)" ON)
+   option(GEOGRAM_WITH_EXPLORAGRAM "Experimental code (hexahedral meshing pipeline and optimal transport)" ON)
+   option(GEOGRAM_WITH_LUA "Built-in LUA interpreter" ON)
+   option(GEOGRAM_LIB_ONLY "Libraries only (no example programs/no viewer)" OFF)
+   option(GEOGRAM_WITH_FPG "Predicate generator (Sylvain Pion's FPG)" OFF)
+   option(GEOGRAM_USE_SYSTEM_GLFW3 "Use the version of GLFW3 installed in the system if found" OFF)
+   set(VORPALINE_PLATFORM "" CACHE STRING "")
+endif()
 
 include(cmake/geogram.cmake)
 
 set(VORPALINE_VERSION_MAJOR 1)
 set(VORPALINE_VERSION_MINOR 6)
-set(VORPALINE_VERSION_PATCH 6)
+set(VORPALINE_VERSION_PATCH 7)
 set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
 
 set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})
@@ -62,7 +65,7 @@ set(VORPALINE_BUILD_NUMBER $ENV{BUILD_NUMBER})
 if(GEOGRAM_WITH_VORPALINE)
    find_package(Subversion QUIET)
    if(NOT SUBVERSION_FOUND)
-       message(WARNING "Subversion executable not found - cannot determine current revision")
+       message(WARNING "Subversion executable not found - cannot determine current revision") 
    else()
        Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Vorpaline)
        message(STATUS "Vorpaline revision is ${Vorpaline_WC_REVISION}")
@@ -120,10 +123,10 @@ if(NOT GEOGRAM_LIB_ONLY)
   add_subdirectory(src/bin)
   add_subdirectory(src/tests)
   add_subdirectory(src/examples)
+  add_subdirectory(tests)
 endif()
 
 add_subdirectory(doc)
-add_subdirectory(tests)
 
 ##############################################################################
 # Cleanup from previous builds

diff --git a/cmake/platforms/Android-aarch64-clang-dynamic/config.cmake b/cmake/platforms/Android-aarch64-clang-dynamic/config.cmake
@@ -0,0 +1,5 @@
+set(ANDROID TRUE)
+set(VORPALINE_WITH_GRAPHICS FALSE)
+set(VORPALINE_BUILD_DYNAMIC TRUE)
+include(${GEOGRAM_SOURCE_DIR}/cmake/platforms/Android-aarch64-clang.cmake)
+
diff --git a/...ms/Android-aarch64-gcc-dynamic/setvars.sh → .../Android-aarch64-clang-dynamic/setvars.sh b/...ms/Android-aarch64-gcc-dynamic/setvars.sh → .../Android-aarch64-clang-dynamic/setvars.sh
diff --git a/cmake/platforms/Android-aarch64-gcc.cmake → cmake/platforms/Android-aarch64-clang.cmake b/cmake/platforms/Android-aarch64-gcc.cmake → cmake/platforms/Android-aarch64-clang.cmake
@@ -31,6 +31,9 @@ add_definitions(${FULL_WARNINGS})
 # Warn about missing virtual destructor (C++ only)
 add_flags(CMAKE_CXX_FLAGS -Wnon-virtual-dtor)
 
+# I do not know where this -Wno-maybe-uninitialized comes from
+# (but clang does not understand it), silence the warning for 
+# now...
 add_flags(CMAKE_CXX_FLAGS -Wno-unknown-warning-option)
 add_flags(CMAKE_C_FLAGS -Wno-unknown-warning-option)
 
@@ -41,8 +44,8 @@ add_flags(CMAKE_CXX_FLAGS -std=c++11)
 # add_flags(CMAKE_CXX_FLAGS_RELEASE -D_FORTIFY_SOURCE=2)
 # add_flags(CMAKE_C_FLAGS_RELEASE -D_FORTIFY_SOURCE=2)
 
+# Android needs this flags, as well as -pie in final linking
 set(ARCH_FLAGS -ffp-contract=off -fPIE -fPIC)
-
 add_flags(CMAKE_CXX_FLAGS ${ARCH_FLAGS})
 add_flags(CMAKE_C_FLAGS ${ARCH_FLAGS})
 add_flags(CMAKE_EXE_LINKER_FLAGS ${ARCH_FLAGS} -pie)
@@ -55,7 +58,6 @@ add_flags(CMAKE_EXE_LINKER_FLAGS ${ARCH_FLAGS} -pie)
 add_flags(CMAKE_CXX_FLAGS -pthread)
 add_flags(CMAKE_C_FLAGS -pthread)
 
-
 # Profiler compilation flags
 if(VORPALINE_WITH_GPROF)
     message(STATUS "Building for code profiling")

diff --git a/cmake/platforms/Android-aarch64-clang/config.cmake b/cmake/platforms/Android-aarch64-clang/config.cmake
@@ -0,0 +1,3 @@
+set(ANDROID TRUE)
+set(VORPALINE_WITH_GRAPHICS FALSE)
+include(${GEOGRAM_SOURCE_DIR}/cmake/platforms/Android-aarch64-clang.cmake)
diff --git a/.../platforms/Android-aarch64-gcc/setvars.sh → ...latforms/Android-aarch64-clang/setvars.sh b/.../platforms/Android-aarch64-gcc/setvars.sh → ...latforms/Android-aarch64-clang/setvars.sh
diff --git a/cmake/platforms/Android-aarch64-gcc-dynamic/config.cmake b/cmake/platforms/Android-aarch64-gcc-dynamic/config.cmake
diff --git a/cmake/platforms/Android-aarch64-gcc/config.cmake b/cmake/platforms/Android-aarch64-gcc/config.cmake
diff --git a/cmake/platforms/Android-armv7-gcc.cmake b/cmake/platforms/Android-armv7-gcc.cmake
diff --git a/cmake/platforms/Android-armv7-gcc/config.cmake b/cmake/platforms/Android-armv7-gcc/config.cmake
diff --git a/cmake/platforms/Android-armv7-gcc/setvars.sh b/cmake/platforms/Android-armv7-gcc/setvars.sh
diff --git a/cmake/platforms/Android-generic/config.cmake b/cmake/platforms/Android-generic/config.cmake
@@ -0,0 +1,5 @@
+
+# Reset the warning level for third parties
+function(vor_reset_warning_level)
+endfunction()
+
diff --git a/cmake/platforms/Emscripten-clang.cmake b/cmake/platforms/Emscripten-clang.cmake
@@ -39,7 +39,7 @@ set(FULL_WARNINGS
 )
 
 # Activate c++ 2011
-add_flags(CMAKE_CXX_FLAGS -std=c++11)
+add_flags(CMAKE_CXX_FLAGS -std=c++11 -Wno-c++98-compat -Wno-gnu-zero-variadic-macro-arguments)
 
 # Compile with full warnings by default
 add_definitions(${FULL_WARNINGS})
@@ -55,10 +55,8 @@ endif()
 # Note: they are added to CMAKE CXX and C flags later on, because the
 # way add_flags() works may remove the second "-s" argument.
 # Note: TOTAL_MEMORY needs to be a multiple of 16M
-set(EM_FLAGS_RELEASE -O3 -s USE_GLFW=3 -s TOTAL_MEMORY=268435456 )
-set(EM_FLAGS_DEBUG -O2 -s ASSERTIONS=2 -s SAFE_HEAP=1 -g -s USE_GLFW=3 -s TOTAL_MEMORY=268435456 )
-#set(EM_FLAGS_DEBUG -s ASSERTIONS=2 -s SAFE_HEAP=1 -g -s USE_GLFW=3 -s TOTAL_MEMORY=268435456 )
-
+set(EM_FLAGS_RELEASE -O3 -s USE_GLFW=3 -s TOTAL_MEMORY=268435456 -s WASM=0)
+set(EM_FLAGS_DEBUG -O2 -s ASSERTIONS=2 -s SAFE_HEAP=1 -g -s USE_GLFW=3 -s TOTAL_MEMORY=268435456 -s WASM=0)
 
 # Profiler compilation flags
 if(VORPALINE_WITH_GPROF)

diff --git a/cmake/platforms/Linux-clang.cmake b/cmake/platforms/Linux-clang.cmake
@@ -1,9 +1,13 @@
 #-------------------------------------------------------------------
-# Flags common to all Linux based platforms with GNU compiler
+# Flags common to all Linux based platforms with Clang compiler
 #-------------------------------------------------------------------
 
 include(${GEOGRAM_SOURCE_DIR}/cmake/platforms/Linux.cmake)
 
+# Set the Clang compilers
+set(CMAKE_C_COMPILER "/usr/bin/clang-3.8" CACHE string "clang compiler" FORCE)
+set(CMAKE_CXX_COMPILER "/usr/bin/clang++-3.8" CACHE string "clang compiler" FORCE)
+
 # Warning flags
 set(NORMAL_WARNINGS -Wall -Wextra)
 
@@ -26,9 +30,15 @@ if(VORPALINE_WITH_CLANGSA)
     add_definitions(--analyze)
 endif()
 
+# I do not know where this -Wno-maybe-uninitialized comes from
+# (but clang does not understand it), silence the warning for 
+# now...
+add_flags(CMAKE_CXX_FLAGS -Wno-unknown-warning-option)
+add_flags(CMAKE_C_FLAGS -Wno-unknown-warning-option)
+
 # Add static and dynamic bounds checks (optimization required)
-add_flags(CMAKE_CXX_FLAGS_RELEASE -D_FORTIFY_SOURCE=2)
-add_flags(CMAKE_C_FLAGS_RELEASE -D_FORTIFY_SOURCE=2)
+#add_flags(CMAKE_CXX_FLAGS_RELEASE -D_FORTIFY_SOURCE=2)
+#add_flags(CMAKE_C_FLAGS_RELEASE -D_FORTIFY_SOURCE=2)
 
 # Enable SSE3 instruction set
 add_flags(CMAKE_CXX_FLAGS -msse3)

diff --git a/cmake/platforms/Linux-gcc.cmake b/cmake/platforms/Linux-gcc.cmake
@@ -79,7 +79,6 @@ add_flags(CMAKE_C_FLAGS -fPIC)
 add_flags(CMAKE_CXX_FLAGS -fvisibility=hidden)
 add_flags(CMAKE_C_FLAGS -fvisibility=hidden)
 
-
 # Profiler compilation flags
 if(VORPALINE_WITH_GPROF)
     message(STATUS "Building for code profiling")

diff --git a/cmake/platforms/Linux-gcc464.cmake b/cmake/platforms/Linux-gcc464.cmake
diff --git a/cmake/platforms/Linux64-gcc464-dynamic/config.cmake b/cmake/platforms/Linux64-gcc464-dynamic/config.cmake
diff --git a/cmake/platforms/Linux64-gcc464-dynamic/setvars.sh b/cmake/platforms/Linux64-gcc464-dynamic/setvars.sh
diff --git a/cmake/platforms/Linux64-gcc464/config.cmake b/cmake/platforms/Linux64-gcc464/config.cmake
diff --git a/cmake/platforms/Linux64-gcc464/setvars.sh b/cmake/platforms/Linux64-gcc464/setvars.sh
diff --git a/doc/devkit/compiling.dox b/doc/devkit/compiling.dox
diff --git a/src/bin/fpg/FPG/AST.h b/src/bin/fpg/FPG/AST.h
@@ -11,7 +11,7 @@
 #include <FPG/Symbol.h>
 #include <FPG/Location.h>
 
-class Visitor;
+struct Visitor;
 
 namespace AST {
 
@@ -33,7 +33,7 @@ struct Clone_context {
 
 
 struct Node {
-    friend class ::Visitor;
+    friend struct ::Visitor;
     Node() : location(current_location), type(nullptr) {}
     virtual ~Node() {}
     static std::string       context;

diff --git a/src/bin/fpg/FPG/SymbolEnvironment.h b/src/bin/fpg/FPG/SymbolEnvironment.h
@@ -13,7 +13,7 @@ namespace AST {
   struct Node;
 }
 
-class Collect_variables;
+struct Collect_variables;
 
 
 struct SymbolEnvironment {

diff --git a/src/bin/fpg/FPG/io.h b/src/bin/fpg/FPG/io.h
@@ -4,7 +4,7 @@
 #include <string>
 
 namespace AST {
-     class TranslationUnit;
+    struct TranslationUnit;
 }