Commit Graph

74 Commits

Author SHA1 Message Date
Greg Landrum
06237a88c5 cleanup to make static builds work 2019-03-31 08:22:25 +02:00
Greg Landrum
24f1737839 Remove a bunch of Python2-related warts (#2315)
* remove all of the "from __future__" imports

* remove the first batch of rdkit.six imports/uses

* next step of rdkit.six removal

* removing xrange, range, and some maps

* next round of removals

* next round of cleanups

* fix inchi test

* last bits of "from rdkit.six" are gone

* and the last of the six stuff is gone

* strange importlib problem
2019-03-06 20:43:49 -05:00
Ric
3cc9206a48 Update build rules for coorgen & maeparser (#2184) 2019-01-06 06:28:00 +00:00
Greg Landrum
9ac981d60a Merge branch 'memcheck_on_tests' of https://github.com/ricrogz/rdkit into ricrogz-memcheck_on_tests 2018-10-31 05:25:56 +01:00
Greg Landrum
7976c36b87 add explicit catch dependency for tests that use it (#2126) 2018-10-19 16:38:58 +02:00
Ric
4294921058 Enabled ctest memcheck to run on tests 2018-10-12 09:34:09 -04:00
Paolo Tosco
f7c888844d moved test.h from RDBoost to RDGeneral for consistency with export.h (#2074) 2018-10-11 17:35:23 -04:00
Greg Landrum
223513a76e Start to use Catch2 for new tests (#1732)
* backup

* build works

* works

* builds on linux

* rename the test

* add another test to make sure that works
2018-09-04 10:32:17 -04:00
Greg Landrum
2738c35178 Fixes #1903 (#1971)
* Fixes #1903

* update SWIG bindings too
2018-07-25 09:14:17 +02:00
Paolo Tosco
1009511907 - fixes the absence of the RDKit prefix in .so/.dylib libraries (#1915) 2018-06-15 07:43:56 +01:00
Paolo Tosco
45499c7bca - allows coordgen and maeparser to be built as static libraries (#1909) 2018-06-14 05:43:59 +02:00
Dan N
5c919dbbdc Fix curl fallback for downloading files (#1904)
The curl file download fallback option was not saving files as
the correct filename. Instead, it used the -O option, which
saved the files using the remote's name for the file! This
was problematic for files downloaded using specification of git
sha.
2018-06-09 04:48:18 +02:00
Paolo Tosco
5ca9148ece - do not re-generate export.h and test.h if they have not changed (#1901) 2018-06-08 06:56:37 +02:00
Paolo Tosco
97d147b3f1 - fixes the dynamic/static library CMake logic (#1875) 2018-05-27 07:13:03 +02:00
Paolo Tosco
c08ea49bda - enable building DLLs on Windows (#1861)
* - enable building DLLs on Windows

* - export.h and test.h are now auto-generated by CMake
2018-05-16 08:42:41 +02:00
Greg Landrum
26f1f4cf01 builds on ubuntu 18.04 (#1858) 2018-05-10 05:04:39 +02:00
Greg Landrum
0959261f37 Fixes #1454 (#1838)
* Fixes #1454; still needs a bit more thinking though

* forgot the necessary version bump

* review related cleanup and a fix to allow the SWIG wrappers to be built
2018-05-07 09:48:47 -04:00
Greg Landrum
dc2fc401f1 allow libs to not be installed (#1832) 2018-04-21 07:27:37 +02:00
Greg Landrum
044bb83bd0 Fix python linkage (#1808)
* apply (manually) #1807 from @bp-kelley to modern_cxx branch and fix (hopefully) a windows problem

* another windows problem

* another windows problem

* windows now builds locally

* update link targets
2018-04-05 06:16:17 +02:00
Greg Landrum
38a449a03d fix an irritating cmake problem (#1715) 2018-01-10 16:14:58 -05:00
Greg Landrum
c7da217d13 update static linkage too 2018-01-01 08:50:42 +01:00
Greg Landrum
62d53d2df6 help with the windows builds 2017-12-28 06:09:14 +00:00
Matt Swain
15c31e1f88 Update embedded InChI to v1.05 (#1684)
* Update download-inchi.sh for InChI 1.05

* Fix downloadAndCheckMD5

* Update FindInchi.cmake for InChI 1.05

* Update CMakeLists.txt for InChI 1.05
2017-12-21 05:45:24 +01:00
Greg Landrum
03e351e68b remove the dependency of the static libs on the dynamic libs 2017-11-25 14:07:01 +01:00
Patrick Avery
206e8a8e17 Update CPack to create .deb files correctly (#1580)
* Update CPack to create .deb files correctly

* get this working with debs
2017-11-15 06:51:38 +01:00
Alain Vaucher
7795a425ff Further cmake improvements (#1515)
* New syntax to import Qt5 dependency in MolDraw2D

* In QTDemo, not necessary to import Qt explicitly because it is automatically imported through target MolDraw2D

* improve import of Cairo dependency

* Remove explicit linking of Cairo in C++ examples

* Use imported targets for Boost

* Using imported CMake targets for Eigen

* Use imported targets for Threads

* Simplify sample CMakeLists

* Remove duplication

* a couple small changes for travis

* typo

* update toolchain to trusty

* switch to requiring at least boost 1.56

* typo

* update boost dependency to pull in the build that has more libraries

* meaningless commit to trigger travis

* switch to ust libc++

* install libc++

* check abi

* try the other one; disable py27 for the moment to speed things up

* switch to c++11, that seems necessary with the conda boost builds at the moment

* re-enable python2.7
2017-08-07 15:49:08 +02:00
Alain Vaucher
21e6b81935 Merge branch 'master' into modern-cmake 2017-07-01 17:59:14 +02:00
Alain Vaucher
7c22e95fbd Setting correct dependencies for the static variants of the libraries 2017-07-01 17:18:51 +02:00
Alain Vaucher
9261d8c74b Linking against the interface library also for the static variant 2017-07-01 14:10:18 +02:00
Alain Vaucher
5bdf2a3cf4 Add INTERFACE library, rdkit_base, against which all other rdkit libraries will link 2017-07-01 13:40:34 +02:00
Paolo Tosco
ea6cfe35ee - updated FindCairo.cmake (#1455) 2017-06-29 20:33:12 +02:00
Greg Landrum
1d04eb3351 add "RDKit" to the beginning of all library names (#1349) 2017-03-20 09:33:13 -04:00
gedeck
0845573a45 Script PythonFormat uses yapf to check the formatting of Python files 2016-10-29 17:13:13 -04:00
Greg Landrum
4f2ec84e7b Add some 3D molecular descriptors (#1084)
* update .gitignore

* foundation for 3D descriptors
move PBF into core

* cleanup work

* a bit more cleanup

* move the principal moments calc to MolTransforms

* cleanup

* cleanups

* add caching of the principal moments and values

* do not include the 3D descriptors in MolDescriptors.h

* the properties are computed

* add PMI descriptors and tests

* add tests for NPR descriptors

* return 0 when the largest PMI is zero

* PMI edge case tests

* NPR edge case tests

* PBF edge case tests

* PBF edge case tests

* more edge cases

* add a few more 3d descriptors

* add defns to docs

* tests for the new descriptors

* add versions to new descriptors

* add 3d descriptors to python wrapper

* add eigen support to the travis build

* try to get non-windows builds working

* remove computeCovarianceMatrix() from java wrapper

* make pmi property names "private"
2016-10-10 08:34:08 -04:00
gedeck
e9af48ffd7 Issue1071/yapf (#1078)
* Issue #1071: add yapf configuration file

* yapf formatting of Code directory

* yapf formatting of Contrib directory

* yapf formatting of Data directory

* yapf formatting of Docs directory

* yapf formatting of External directory

* yapf formatting of Projects directory

* yapf formatting of Regress directory

* yapf formatting of Scripts directory

* yapf formatting of Web directory

* yapf formatting of rdkit directory
2016-09-23 04:58:46 +02:00
Paolo Tosco
5d3bb11488 Fix Inchi being hardcoded into PostgreSQL (#1009)
* - this should fix the problem with "Inchi" being hardcoded into PostgreSQL

* - moved the InChI check code out of the main CMakeLists.txt
  into FindInchi.cmake
2016-08-08 11:22:56 +02:00
Paolo Tosco
e642c46525 Made DistGeomHelpers test robust against small 3D coordinate variations (#961)
* - made Code/GraphMol/DistGeomHelpers/testDgeomHelpers.cpp and Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py
  more robust against very small coordinate variations which may induce UFF energy variations in the 1-kcal/mol range.
  This was observed in a single case using the MinGW 32-bit g++ compiler. The check for identity of conformations
  between single- and multi-threaded runs is now complemented by a 3D coordinate MSD check

* - lowered the energy tolerance to 1.0 kcal/mol

* - added rdkitBuild string with compile-time information
- added runtime check in Code/GraphMol/DistGeomHelpers/testDgeomHelpers.cpp
  and Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py
  to use more lenient tolerances with MinGW compilers
2016-06-28 20:11:31 +02:00
Paolo Tosco
31f2b33cbc - download URLs and MD5 checksums can now be overridden with CMake
definitions
- InChI and AvalonTools README files were updated accordingly
2016-02-28 07:49:45 +00:00
Paolo Tosco
8444ae2190 - added compatibility with CMake < 2.8.12 which lacks the DIRECTORY
get_filename_component argument
2016-02-27 22:47:18 +00:00
Paolo Tosco
4363a40489 - added a downloadAndCheckMD5() function which attempts to use CMake
DOWNLOAD first, and if it fails it falls back to curl (Unix, OS X)
  or Powershell (Windows). The MD% sum is check with the nativa CMake
  command md5sum
2016-02-27 22:15:46 +00:00
Andrew Dalke
6d66534743 removed bare except statements 2015-09-07 13:27:14 +02:00
Greg Landrum
9e8c4b24ba Merge pull request #412 from rdkit/new_drawing_Jan2015
New C++ drawing code
2015-01-20 02:37:03 -05:00
Brian Kelley
626f8b522d RDKit learns how to compute code coverage for tests
To use code coverage:

cmake -DCMAKE_BUILD_TYPE=Debug \
      -DRDK_USE_FLEXBISON=ON \
      -DRDK_TEST_COVERAGE=ON \
      <path to rdkit source tree>

make install
make RDKit_coverage

Note, when making RDKit_coverage, your python paths, (DY)LD_LIBRARY paths must be
set up correctly.  If any of the tests fail, the coverage generator will most
likely fail and certainly will not be complete.

Here is an example from my OSX Box (note, I set the install directory to rdkit_build via)
cmake -DCMAKE_INSTALL_PREFIX=`pwd`/rdkit_build \
    ...

RDBASE=<path to rdkit source>  DYLD_LIBRARY_PATH=`pwd`/rdkit_build/lib \
 PYTHONPATH=`pwd`/rdkit_build/lib/python2.7/site-packages \
 make RDKit_coverage

open coverage/index.html in a browser
2015-01-15 11:53:27 -05:00
Greg Landrum
a65570b344 this now builds as part of the base RDKit 2015-01-05 19:02:51 +01:00
David Hall
49138316b6 use print function in FindNumpy.cmake for python3 compatibility 2014-11-07 13:43:46 -05:00
Riccardo Vianello
b1d8707c13 support running tests when building inside the source tree on windows 2014-04-12 15:24:29 +02:00
Greg Landrum
a53cb2c9e6 Fixes #185 2014-01-01 08:18:17 +01:00
Greg Landrum
e6360e62ca update build system for windows 2013-04-18 02:33:41 +00:00
Greg Landrum
e566afff2f merge in Riccardo Vianello's changes to make it easier to build c++ programs using the RDKit with cmake 2011-08-07 16:34:42 +00:00
Eddie Cao
fe75f9a5dc fix system inchi detection; system inchi takes precedence over local one 2011-07-12 00:16:28 +00:00