Commit Graph
26 Commits
Author SHA1 Message Date
Eisuke Kawashima 67fe818429 Add .gitattributes and renormalize EOL 2022-06-10 17:24:09 +09:00
Benny Siegert b6887a8a82 Do not search for coordgen template files.
The coordgen upstream does not install the template file. It is
also not required at runtime, since its contents are compiled into
the coordgen library itself.

Fixes #2214
2020-11-04 20:31:17 +01:00
Ricardo R-S e259b67377 add Find modules for maeparser and coordgen 2019-10-16 15:57:46 -04:00
Rocco Meli aff4330d1c PDB and PDBQT Insertion Code Fixes (#1998)
* add quotes
* fix icode copy
* ignore static build dir
* indentation
* fix icode in PDBQT
* remove debug code
* cleanup
2019-08-28 17:04:18 -04:00
Matt Swain 659cc92acf CMake use system rapidjson or download on demand 2018-02-11 15:03:32 +00:00
Matt Swain 5a271fa552 Add CMake module to check native optimizations 2018-02-11 14:58:24 +00:00
David Hall 00120f89cf Compiler version parsing and comparison from CMake 2.8
Fix for #1624 by using CMake's version parsing. Also move to using
CMake's internal version comparison operators.
2017-09-04 00:30:10 +00:00
Reinis Danne 80bfbca550 cmake/modules/UsePythonTest.cmake: Pop policy on return
Otherwise test build fails if Python interpreter is not found or is
unset.
2016-01-09 17:22:11 +02:00
Noel O'Boyle 341677c44f The original commit broke the build for older CMake. This commit places the policy instructions inside an "if" guard. It also selects for the NEW behaviour, as recommended by the CMake documentation. Works on Windows. Let's see what Travis says. 2015-04-23 20:29:57 +01:00
Noel O'Boyle 9d5b4d5dfc Tweak to silence CMake warnings about UsePythonTest.cmake (if using recent versions of CMake). 2015-04-20 19:54:59 +01:00
Matt Swain 11a45675e7 Remove unescaped quotes in UsePythonTest.cmake
UsePythonTest.cmake contains a template that is used to create a series of cmake files that execute tests for the python language bindings. Quotes within this template need to be escaped, otherwise they fail to appear in the resulting cmake files.

In this context, the unescaped quotes were optional so no error was actually caused. However, as of cmake 2.8.12, the unescaped quotes cause a warning when running cmake: "Argument not separated from preceding token by whitespace."

This change simply removes the unescaped quotes, causing no changes to the resulting cmake files.
2013-11-04 17:01:46 +00:00
Matt Swain 399470a91b Still attempt to find Cairo even if pkgconfig fails
Under certain circumstances, pkgconfig won't successfully return the include and library paths for Cairo, however cmake will still manage to find them with find_path and find_library.

Specifically, this can be an issue if Cairo is installed using Homebrew on Mac OS X, which just relies on X11/XQuartz for some of its dependencies. This is a problem because /opt/X11/lib/pkgconfig/ is not visible to pkgconfig by default, so instead of returning the include and library paths for Cairo, pkgconfig just complains that dependencies are missing (even though they aren't).

Even without the hints from pkgconfig, cmake will still manage to find the correct paths in most cases, especially if they are sensible like the Homebrew defaults of /usr/local/lib/libcairo.dylib and /usr/local/include/cairo
2013-06-27 18:07:48 +01:00
Geoff Hutchison 396e5b53c8 Add /usr/local/include as a search path for InChI headers. 2013-04-22 14:37:23 -04:00
Marcus D. Hanwell 6a7ecd6c95 PkgConfig should not be required - fail gracefully
If PkgConfig is not available then we cannot find Cairo, but this should
fail gracefully so that systems without Cario can simply disbale options.
2013-03-30 09:41:04 -04:00
Noel O'Boyle e9c7405bb4 CMakeLists.txt, formats/CMakeLists.txt, FindCairo.cmake: Add Cmake build support for PNG depiction on Linux. On Ubuntu, install libcairo2-dev if you want PNG depiction. 2011-05-29 16:05:51 +00:00
Geoffrey Hutchison 9dba9823c3 Initial changes to support Eigen3 2011-05-19 18:34:45 +00:00
Geoffrey Hutchison 0ffd9199f1 Patches from Fedora packaging. 2010-12-15 21:45:57 +00:00
Noel O'Boyle 94c81581d6 More tweaks to the Python binding tests. This time to fix things on Windows. Hopefully everything should now pass on both Linux and Windows. 2010-11-18 15:03:04 +00:00
Noel O'Boyle e0ca80aac2 test/testbindings.py, test/CMakeLists.txt, cmake/modules/UsePythonTest.cmake:
Ensure that the environment variables LD_LIBRARY_PATH, BABEL_*DIR are
	set by CMake before running the Python binding tests. This involved
	editing	the UsePythonTest CMake module to allow these values to be
	passed. I also made sure that these tests can run directly.
	TODO: Sort this all out on Windows.
2010-11-18 11:41:31 +00:00
Tim Vandermeersch ded9c19a75 cmake/modules/UsePythonTest.cmake, text/CMakeLists.txt: Only use python tests when python is found. 2010-10-17 01:14:21 +00:00
Marcus D. Hanwell 82d487e0ed Added option to use a system inchi library.
This is my first attempt at adding an option to build against a system inchi
library. It looks for an inchi library in the standard locations, and adds in
some logic to use that library if selected.
2010-10-13 00:21:59 +00:00
Geoffrey Hutchison 8efda5fa87 Slight restructuring of partial charge models, now OBChargeModel.
Added contribution from Jiahao Chen:
        * src/charges/qeq.h, src/charges/qeq.cpp:
        Added implementation of QEq charge model (Rappe and Goddard, 1991) 

        * src/charges/qtpie.h, src/charges/qtpie.cpp:
        Added implementation of QTPIE charge model (Chen and Martinez, 2007;
        2008)

        * src/atom.cpp: added comments to show how these new charge models can
        be called from within current OpenBabel code
           
        * CMakeLists.txt: added charge models and compile flags for Eigen2
        library (variables copied from Avogadro source tree)
2010-04-21 03:04:30 +00:00
Noel O'Boyle 37f083556e 2010-02-22 Noel O'Boyle
Enable testing of OpenBabel executables from Python
	* test/testbabel.py: Initial checkin of tests for the Babel executable
	* test/CMakeLists.txt: Add testbabel.py
	* cmake/modules/UsePythonTest.cmake: Add a CMake module for adding
	Python tests (BSD License) from Mathieu Malaterre
2010-02-22 22:29:48 +00:00
Geoffrey Hutchison 13e410b049 * Makefile.am: Move cmake to EXTRA_DIST (4 Makefiles for one
file?)
        * Makefile.in: Regenerated.
2008-06-30 17:27:46 +00:00
Michael Banck ad018c6619 2008-06-30 Michael Banck <mbanck@gmx.net>
* Makefile.am (SUBDIRS): Added cmake.
        * Makefile.in: Regenerated.
        * cmake/Makefile.am: New file.
        * cmake/Makefile.in: New file.
        * cmake/modules/Makefile.am: Likewise.
        * cmake/modules/Makefile.in: Likewise.
        * configure.in (AC_OUTPUT): Added cmake/Makefile and
        cmake/modules/Makefile.
        * configure: Regenerated.
        * acinclude (AM_PATH_XML2): New macro, copied from aclocal.m4.
2008-06-30 16:28:54 +00:00
Marcus D. Hanwell 3d8a7123ba Added visibility support when using a recent GCC compiler. Various related
fixes to ensure everything compiles and links correctly.
2008-04-13 15:28:51 +00:00