[geogram] update to 1.3.11

Author: simogasp

CMakeLists.txt

@@ -30,7 +30,7 @@ include(cmake/geogram.cmake)
 
 set(VORPALINE_VERSION_MAJOR 1)
 set(VORPALINE_VERSION_MINOR 3)
-set(VORPALINE_VERSION_PATCH 10)
+set(VORPALINE_VERSION_PATCH 11)
 set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
 
 set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})
@@ -93,39 +93,32 @@ add_custom_target(uninstall
 # Geogram/Vorpaline sources
 
 add_subdirectory(src/lib/geogram)
-add_subdirectory(src/bin/vorpastat)
-add_subdirectory(src/bin/vorpacomp)
-add_subdirectory(src/bin/geodump)
-
-if(GEOGRAM_WITH_FPG)
-   add_subdirectory(src/bin/fpg)
-endif()
-
 if(GEOGRAM_WITH_VORPALINE)
    add_subdirectory(src/lib/vorpalib)
-   add_subdirectory(src/bin/vorpaline)
-else()
-   add_subdirectory(src/bin/vorpalite)
 endif()
 
 add_subdirectory(src/lib/third_party)
 
 if(GEOGRAM_WITH_GRAPHICS)
-   add_subdirectory(src/lib/geogram_gfx)
-   add_subdirectory(src/bin/vorpaview)
-   add_subdirectory(src/bin/geobox)   
+  add_subdirectory(src/lib/geogram_gfx)
 endif()
 
-add_subdirectory(src/test)
+if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/src/lib/exploragram)
+  set(GEOGRAM_WITH_EXPLORAGRAM TRUE)
+  add_subdirectory(src/lib/exploragram)
+endif()
 
-if(GEOGRAM_WITH_GRAPHICS)
-   add_subdirectory(src/demos)
+if(NOT GEOGRAM_LIB_ONLY)
+  add_subdirectory(src/bin)
+  add_subdirectory(src/test)
+  if(GEOGRAM_WITH_GRAPHICS)
+    add_subdirectory(src/demos)
+  endif()
 endif()
 
 add_subdirectory(doc)
 add_subdirectory(tests)
 
-
 ##############################################################################
 # Cleanup from previous builds
 

CMakeOptions.txt.graphite

@@ -9,4 +9,8 @@ elseif(UNIX)
    set(VORPALINE_PLATFORM Linux64-gcc-dynamic)
 endif()
 
+# Only geogram, geogram_gfx and GLFW will be built
+# (skips generation of geogram demos and programs)
+
+set(GEOGRAM_LIB_ONLY TRUE)
 

cmake/doxygen.cmake

@@ -9,7 +9,7 @@ set(DOXYGEN_MINIMUM_VERSION 1.7.0)
 
 find_package(Doxygen ${DOXYGEN_MINIMUM_VERSION} QUIET)
 if(NOT DOXYGEN_FOUND)
-    message(WARNING "Doxygen >= ${DOXYGEN_MINIMUM_VERSION} not found, cannot generate documentation")
+    message(STATUS "Doxygen >= ${DOXYGEN_MINIMUM_VERSION} not found, cannot generate documentation")
     unset(DOXYGEN_EXECUTABLE CACHE)
     return()
 endif()

src/bin/CMakeLists.txt

@@ -0,0 +1,19 @@
+
+add_subdirectory(vorpastat)
+add_subdirectory(vorpacomp)
+add_subdirectory(geodump)
+
+if(GEOGRAM_WITH_GRAPHICS)
+  add_subdirectory(vorpaview)
+  add_subdirectory(geobox)
+endif()
+
+if(GEOGRAM_WITH_VORPALINE) 
+  add_subdirectory(vorpaline)
+else()
+  add_subdirectory(vorpalite)
+endif()
+
+if(GEOGRAM_WITH_FPG)
+  add_subdirectory(fpg)
+endif()

src/lib/exploragram/CMakeLists.txt

@@ -0,0 +1,22 @@
+
+aux_source_directories(SOURCES "Source Files"                    .)
+aux_source_directories(SOURCES "Source Files\\hexdom"            hexdom)
+aux_source_directories(SOURCES "Source Files\\optimal_transport" optimal_transport)
+
+include_directories(${PROJECT_BINARY_DIR}/src/lib)
+
+add_library(exploragram ${SOURCES})
+
+set_target_properties(exploragram PROPERTIES
+                      VERSION ${VORPALINE_VERSION}
+                      SOVERSION ${VORPALINE_VERSION_MAJOR})
+
+if(UNIX AND VORPALINE_BUILD_DYNAMIC)
+    target_link_libraries(exploragram pthread dl)
+endif()
+
+if(WIN32)
+    target_link_libraries(exploragram psapi)
+endif()
+
+target_link_libraries(exploragram geogram)

src/lib/exploragram/api/defs.h

@@ -0,0 +1,32 @@
+
+#ifndef EXPLORAGRAM_API_DEFS
+#define EXPLORAGRAM_API_DEFS
+
+#include <geogram/api/defs.h>
+
+/**
+ * \file exploragram/api/defs.h
+ * \brief Basic definitions for the exploragram API
+ */
+
+/**
+ * \brief Linkage declaration for exploragram symbols.
+ */
+#ifdef exploragram_EXPORTS
+#define EXPLORAGRAM_API GEO_EXPORT
+#else
+#define EXPLORAGRAM_API GEO_IMPORT
+#endif
+
+/**
+ * \brief A place-holder linkage declaration to indicate
+ *  that the symbol should not be exported by Windows DLLs.
+ * \details For instance, classes that inherit templates from
+ *  the STL should not be exported, else it generates multiply
+ *  defined symbols.
+ */
+#define NO_EXPLORAGRAM_API
+
+
+#endif
+

src/lib/exploragram/basic/common.h

@@ -0,0 +1,10 @@
+
+#ifndef EXPLORAGRAM_BASIC_COMMON
+#define EXPLORAGRAM_BASIC_COMMON
+
+#include <exploragram/api/defs.h>
+#include <geogram/basic/common.h>
+#include <geogram/basic/logger.h>
+
+#endif
+

src/lib/exploragram/extract_hexdom.sh

@@ -0,0 +1,13 @@
+HEXDOM_PLUGIN_PATH=/home/levy/Programming/graphite/plugins/OGF/hexdom/
+rm -f hexdom/*
+cp $HEXDOM_PLUGIN_PATH/algo/*.h hexdom/
+cp $HEXDOM_PLUGIN_PATH/algo/*.cpp hexdom/
+cd hexdom
+for i in `ls *.h *.cpp`
+do
+    cat $i | sed -e 's|OGF/hexdom/algo|exploragram/hexdom|g' \
+		 -e 's|OGF/hexdom/common|exploragram/basic|g' \
+		 -e 's|hexdom_API|EXPLORAGRAM_API|g' > tempfile \
+		 -e 's|std::cerr\(.*\)std::endl|GEO::Logger::out("HexDom") \1 std::endl|g'
+    mv tempfile $i
+done