Merge pull request #23 from jchristopherson/v1.7.1

Bug fix

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     fplot 
     LANGUAGES Fortran
-    VERSION 1.7.0
+    VERSION 1.7.1
 )
 
 # Get helper macros and functions
@@ -31,9 +31,6 @@ link_library(${PROJECT_NAME} ${collections_LIBRARY} ${collections_INCLUDE_DIR})
 link_library(${PROJECT_NAME} ${geompack_LIBRARY} ${geompack_INCLUDE_DIR})
 link_library(${PROJECT_NAME} ${forcolormap_LIBRARY} ${forcolormap_INCLUDE_DIR})
 
-# Installation
-add_subdirectory(install)
-
 # ------------------------------------------------------------------------------
 # EXAMPLES
 # ------------------------------------------------------------------------------

dependencies/CMakeLists.txt

@@ -1,7 +1,3 @@
-# Get the macros and functions we'll need
-include("${PROJECT_SOURCE_DIR}/cmake/helper.cmake")
-include(FetchContent)
-
 # Get FERROR
 add_subdirectory(ferror)
 set(ferror_LIBRARY ${ferror_LIBRARY} PARENT_SCOPE)

dependencies/collections/CMakeLists.txt

@@ -10,17 +10,6 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(collections)
 
-if (WIN32)
-    if (BUILD_SHARED_LIBS)
-        add_custom_command(
-            TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:collections>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>
-        )
-    endif()
-endif()
-
 set(collections_INCLUDE_DIR ${collections_BINARY_DIR}/include)
 set(collections_INCLUDE_DIR ${collections_INCLUDE_DIR} PARENT_SCOPE)
 

dependencies/ferror/CMakeLists.txt

@@ -1,33 +1,18 @@
-# Get the macros and functions we'll need
 include(FetchContent)
 
 # Fetch the proper content
 FetchContent_Declare(
     ferror
     GIT_REPOSITORY "https://github.com/jchristopherson/ferror"
 )
-
 FetchContent_MakeAvailable(ferror)
 
-if (WIN32)
-    if (BUILD_SHARED_LIBS)
-        add_custom_command(
-            TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:ferror>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}
-        )
-    endif()
-endif()
-
 set(ferror_INCLUDE_DIR ${ferror_BINARY_DIR}/include)
-set(ferror_INCLUDE_DIR ${ferror_INCLUDE_DIR} PARENT_SCOPE)
 configure_file(
     "${ferror_SOURCE_DIR}/include/ferror.h"
     "${ferror_INCLUDE_DIR}/ferror.h"
     COPYONLY
 )
-
-# Make a parent-scope variable for the library
 set(ferror_LIBRARY ferror)
+set(ferror_INCLUDE_DIR ${ferror_INCLUDE_DIR} PARENT_SCOPE)
 set(ferror_LIBRARY ${ferror_LIBRARY} PARENT_SCOPE)

dependencies/forcolormap/CMakeLists.txt

@@ -10,17 +10,6 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(forcolormap)
 
-if (WIN32)
-    if (BUILD_SHARED_LIBS)
-        add_custom_command(
-            TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:forcolormap>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>
-        )
-    endif()
-endif()
-
 set(forcolormap_INCLUDE_DIR ${forcolormap_BINARY_DIR}/include)
 set(forcolormap_INCLUDE_DIR ${forcolormap_INCLUDE_DIR} PARENT_SCOPE)
 

dependencies/fstring/CMakeLists.txt

@@ -10,17 +10,6 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(fstring)
 
-if (WIN32)
-    if (BUILD_SHARED_LIBS)
-        add_custom_command(
-            TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:fstring>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>
-        )
-    endif()
-endif()
-
 set(fstring_INCLUDE_DIR ${fstring_BINARY_DIR}/include)
 set(fstring_INCLUDE_DIR ${fstring_INCLUDE_DIR} PARENT_SCOPE)
 

dependencies/geompack/CMakeLists.txt

@@ -10,17 +10,6 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(geompack)
 
-if (WIN32)
-    if (BUILD_SHARED_LIBS)
-        add_custom_command(
-            TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:geompack>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>
-        )
-    endif()
-endif()
-
 set(geompack_INCLUDE_DIR ${geompack_BINARY_DIR}/include)
 set(geompack_INCLUDE_DIR ${geompack_INCLUDE_DIR} PARENT_SCOPE)
 

docs/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.9.8
+# Doxyfile 1.10.0
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -48,7 +48,7 @@ PROJECT_NAME           = fplot
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.7.0
+PROJECT_NUMBER         = 1.7.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -63,6 +63,12 @@ PROJECT_BRIEF          = "A Fortran library providing a convenient interface for
 
 PROJECT_LOGO           =
 
+# With the PROJECT_ICON tag one can specify an icon that is included in the tabs
+# when the HTML document is shown. Doxygen will copy the logo to the output
+# directory.
+
+PROJECT_ICON           =
+
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
 # entered, it will be relative to the location where doxygen was started. If
@@ -977,10 +983,10 @@ INPUT_FILE_ENCODING    =
 # default file extension mappings.
 #
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm,
-# *.cpp, *.cppm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl,
-# *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d, *.php,
-# *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be
-# provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.cpp, *.cppm, *.ccm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl,
+# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d,
+# *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to
+# be provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
 # *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
@@ -1176,7 +1182,8 @@ FORTRAN_COMMENT_AFTER  = 72
 SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
+# multi-line macros, enums or list initialized variables directly into the
+# documentation.
 # The default value is: NO.
 
 INLINE_SOURCES         = NO
@@ -1248,6 +1255,46 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then doxygen will add the directory of each input to the
+# include path.
+# The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1431,6 +1478,26 @@ HTML_DYNAMIC_SECTIONS  = NO
 
 HTML_CODE_FOLDING      = YES
 
+# If the HTML_COPY_CLIPBOARD tag is set to YES then doxygen will show an icon in
+# the top right corner of code and text fragments that allows the user to copy
+# its content to the clipboard. Note this only works if supported by the browser
+# and the web page is served via a secure context (see:
+# https://www.w3.org/TR/secure-contexts/), i.e. using the https: or file:
+# protocol.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COPY_CLIPBOARD    = YES
+
+# Doxygen stores a couple of settings persistently in the browser (via e.g.
+# cookies). By default these settings apply to all HTML pages generated by
+# doxygen across all projects. The HTML_PROJECT_COOKIE tag can be used to store
+# the settings under a project specific key, such that the user preferences will
+# be stored separately.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_PROJECT_COOKIE    =
+
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
 # and collapse entries dynamically later on. Doxygen will expand the tree to
@@ -2279,9 +2346,9 @@ GENERATE_SQLITE3       = NO
 
 SQLITE3_OUTPUT         = sqlite3
 
-# The SQLITE3_OVERWRITE_DB tag is set to YES, the existing doxygen_sqlite3.db
+# The SQLITE3_RECREATE_DB tag is set to YES, the existing doxygen_sqlite3.db
 # database file will be recreated with each doxygen run. If set to NO, doxygen
-# will warn if an a database file is already found and not modify it.
+# will warn if a database file is already found and not modify it.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_SQLITE3 is set to YES.
 
@@ -2522,7 +2589,11 @@ DOT_FONTPATH           =
 # the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
 # CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
 # If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
-# relations will be shown as texts / links.
+# relations will be shown as texts / links. Explicit enabling an inheritance
+# graph or choosing a different representation for an inheritance graph of a
+# specific class, can be accomplished by means of the command \inheritancegraph.
+# Disabling an inheritance graph can be accomplished by means of the command
+# \hideinheritancegraph.
 # Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
 # The default value is: YES.
 
@@ -2587,8 +2658,8 @@ DOT_UML_DETAILS        = NO
 
 # The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
 # to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
+# significantly it will be wrapped across multiple lines. Some heuristics are
+# applied to avoid ugly line breaks.
 # Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 

docs/html/annotated.html

@@ -27,7 +27,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.0</span>
+   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.1</span>
    </div>
    <div id="projectbrief">A Fortran library providing a convenient interface for plotting with Gnuplot.</div>
   </td>

docs/html/classes.html

@@ -27,7 +27,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.0</span>
+   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.1</span>
    </div>
    <div id="projectbrief">A Fortran library providing a convenient interface for plotting with Gnuplot.</div>
   </td>

docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html

@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=11"/>
 <meta name="generator" content="Doxygen 1.10.0"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>fplot: D:/Code/fplot/src Directory Reference</title>
+<title>fplot: D:/Code/fplot-1/src Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -27,7 +27,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.0</span>
+   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.1</span>
    </div>
    <div id="projectbrief">A Fortran library providing a convenient interface for plotting with Gnuplot.</div>
   </td>

docs/html/files.html

@@ -27,7 +27,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.0</span>
+   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.1</span>
    </div>
    <div id="projectbrief">A Fortran library providing a convenient interface for plotting with Gnuplot.</div>
   </td>

docs/html/fplot__arrow_8f90_source.html

@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=11"/>
 <meta name="generator" content="Doxygen 1.10.0"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>fplot: D:/Code/fplot/src/fplot_arrow.f90 Source File</title>
+<title>fplot: D:/Code/fplot-1/src/fplot_arrow.f90 Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -27,7 +27,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.0</span>
+   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.1</span>
    </div>
    <div id="projectbrief">A Fortran library providing a convenient interface for plotting with Gnuplot.</div>
   </td>

docs/html/fplot__axis_8f90_source.html

@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=11"/>
 <meta name="generator" content="Doxygen 1.10.0"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>fplot: D:/Code/fplot/src/fplot_axis.f90 Source File</title>
+<title>fplot: D:/Code/fplot-1/src/fplot_axis.f90 Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -27,7 +27,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.0</span>
+   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.1</span>
    </div>
    <div id="projectbrief">A Fortran library providing a convenient interface for plotting with Gnuplot.</div>
   </td>

docs/html/fplot__colormap_8f90_source.html

@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=11"/>
 <meta name="generator" content="Doxygen 1.10.0"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>fplot: D:/Code/fplot/src/fplot_colormap.f90 Source File</title>
+<title>fplot: D:/Code/fplot-1/src/fplot_colormap.f90 Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -27,7 +27,7 @@
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.0</span>
+   <div id="projectname">fplot<span id="projectnumber">&#160;1.7.1</span>
    </div>
    <div id="projectbrief">A Fortran library providing a convenient interface for plotting with Gnuplot.</div>
   </td>