Merge pull request #2093 from voidpin/master

patched to build on NetBSD
openbabel · Nov 24, 2019 · 59dff1b · 59dff1b
2 parents c251724 + 5dd6ad8
commit 59dff1b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,5 +1,7 @@
+include(GNUInstallDirs)
+
 file(GLOB man_1 *.1)
-install(FILES ${man_1} DESTINATION share/man/man1)
+install(FILES ${man_1} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 install(FILES splash.png DESTINATION share/openbabel/${BABEL_VERSION})
 
 OPTION(BUILD_DOCS "Build Open Babel documentation" OFF)

diff --git a/src/conformersearch.cpp b/src/conformersearch.cpp
@@ -23,6 +23,7 @@ GNU General Public License for more details.
 #include <openbabel/elements.h>
 #include <openbabel/bond.h>
 #include "rand.h"
+#include <algorithm>
 
 #if defined(_MSC_VER) && (_MSC_VER < 1800)
  #define OB_ISNAN _isnan

diff --git a/src/formats/confabreport.cpp b/src/formats/confabreport.cpp
@@ -33,6 +33,7 @@ as an example.
 #include <openbabel/babelconfig.h>
 #include <openbabel/obmolecformat.h>
 #include <openbabel/math/align.h>
+#include <algorithm>
 
 using namespace std;
 namespace OpenBabel