github.com/OpenMS/contrib commits | Ecosyste.ms: OpenCollective

Update boost.cmake

dbf282e3d92baba0f6524568c958ca4163b9516c authored over 5 years ago by jpfeuffer <[email protected]>

Introduce variable for toolset version

8d6973fa48fd57317d88dfd480efd73004727e63 authored over 5 years ago by jpfeuffer <[email protected]>

[Update] boost to 1.67

Supports 2017 update 3 and is standard on ubuntu 19.04

41ef9ba253324794f52cce61e8de7c1f3734383e authored over 5 years ago by jpfeuffer <[email protected]>

Merge pull request #87 from hroest/feature/hdf5

[FIX] debug libs for hdf5

b6ae3a0b3d68e5563a8200b19301f8085284e591 authored over 5 years ago by jpfeuffer <[email protected]>

Create License.hdf5.txt

a0a6ee1a795ac4c5964fe548e93a1f91836e2b35 authored over 5 years ago by jpfeuffer <[email protected]>

Add hdf5 license mention

5bca18774c9b6b65a868a3283f969439a79c1e18 authored over 5 years ago by jpfeuffer <[email protected]>

Merge branch 'feature/hdf5' of https://github.com/hroest/contrib

109638343bea24409cb18d3efe7586b06ff9a5f7 authored over 5 years ago by Chris Bielow <[email protected]>

Merge pull request #86 from cbielow/master

minor doc

70b42964ff0a8b87809870aa5694d58ebb5bbefc authored over 5 years ago by Chris Bielow <[email protected]>

[FIX] debug libs for hdf5

f1ae1f380f0211cd8f1dd2de097c97949ed9ec18 authored over 5 years ago by Hannes Roest <[email protected]>

Merge branch 'master' of https://github.com/OpenMS/contrib

a6b32078038e77e4f34134beb340133d7b0d1112 authored over 5 years ago by Chris Bielow <[email protected]>

Merge branch 'master' of https://github.com/cbielow/contrib

5dd4bea8b89ae98513087185c35f91429dc2b986 authored over 5 years ago by Chris Bielow <[email protected]>

[DOC] minor coinor docs

624f1242c5421e0da1d8f93b7e70e3f9510a9438 authored over 5 years ago by Chris Bielow <[email protected]>

Merge pull request #84 from hroest/feature/hdf5

Feature/hdf5

65374475278f7191be9dcc0be7205d5dfaeb83fe authored over 5 years ago by jpfeuffer <[email protected]>

cleanup

bc569e60ceb827b599ecde429731f4567229992e authored over 5 years ago by Hannes Roest <[email protected]>

[HDF5] faster build

14f55690da5731abbe9dcedf13f6a17468cfd3a9 authored over 5 years ago by Hannes Roest <[email protected]>

[FIX] minimal cmake

eb0101dd1e15a93538f54a9a9b83d1aaf163c6ab authored over 5 years ago by Hannes Roest <[email protected]>

[NOP] whitespace fixes

303bc4a3666b142f51989171b28a81db4401de17 authored over 5 years ago by Hannes Roest <[email protected]>

[HDF5] add HDF5

c1a56b560648cbc161a709a303b443b9b8d90fd7 authored over 5 years ago by Hannes Roest <[email protected]>

[HDF5] works

293828bed612e9de8fb7883006dd1b6d8c237406 authored over 5 years ago by Hannes Roest <[email protected]>

Merge pull request #83 from cbielow/master

[FIX] CoinOR debug libs for VisualStudio 2017
[FIX] find bundled patch.exe

3d8710cb57ac3e9876fb6279bf6343db1d954d0f authored almost 6 years ago by Chris Bielow <[email protected]>

try SDK-agnostic CoinMP solution files by querying environment variable for 'WindowsSDKVersion'

6619ef0853a5c9b8e5545d2978550e6f956b37e4 authored almost 6 years ago by chris bielow <[email protected]>

[FIX,WIN] use our patch.exe by default to avoid admin-rights requirement

af63c6d2991938ba08b5e9279869a3f849eae358 authored almost 6 years ago by chris bielow <[email protected]>

[FIX] build proper Debug and Release libs for COINOR library for Visual Studio 15 2017

0daa0b0e054b16d22986cf822b6d0431d3c9c376 authored almost 6 years ago by chris bielow <[email protected]>

Merge pull request #82 from jpfeuffer/fix/compilerBugSeqanGcc5

[FIX] Patch for compiler bug, mistaking < operator for template.

06e887232ed87631585027e1991ebaef098f7b06 authored almost 6 years ago by jpfeuffer <[email protected]>

[DOC] better comment

a32f41b68af481cbfe0e9711417f03eca4ab9472 authored almost 6 years ago by jpfeuffer <[email protected]>

[FIX] wrong path to patched file

2447e2bf3cb1ccaf88fba9305491163aa35cdc2d authored about 6 years ago by Julianus Pfeuffer <[email protected]>

wrong order of the diff

2f44758f368a38d42324b1f8d837ee590a82ad11 authored about 6 years ago by jpfeuffer <[email protected]>

[FIX] Patch for compiler bug, mistaking < operator for template.

7dea394de96e6dd6039a04d372c22286058628b1 authored about 6 years ago by Julianus Pfeuffer <[email protected]>

Merge pull request #79 from OpenMS/feature/no-icu

Try to avoid ICU dependency through boost

320353cbcfe5a85bd36b11f77cb0a7da1b0ac952 authored over 6 years ago by jpfeuffer <[email protected]>

Merge pull request #80 from jpfeuffer/feature/retrydownload

[Feature] Retry download

8649f02a273ac037549976e0297aa6b10fc0bc00 authored over 6 years ago by jpfeuffer <[email protected]>

Added fatal error if unsuccessful.

b05ee548277d62f10a217581027ac874a8a59a28 authored over 6 years ago by jpfeuffer <[email protected]>

[FEATURE] Added retry function to contrib download

89a350ea7a71d4442ba55c9771fb5a1a1366ba34 authored over 6 years ago by jpfeuffer <[email protected]>

Try to avoid ICU dependcy through boost

6701482a599bfb55e0b10fecd3190414e861ac82 authored over 6 years ago by jpfeuffer <[email protected]>

Merge pull request #77 from jpfeuffer/feature/checkCompilerVsn

[FEATURE] Check compiler version

060f3cd20e8e331c44bc70eb6939a2041e5ed979 authored over 6 years ago by jpfeuffer <[email protected]>

[FEATURE] Check compiler version

d76b474b63b874e185d0be0a59594c0b1a047afd authored over 6 years ago by Julianus Pfeuffer <[email protected]>

Merge pull request #75 from cbielow/master

Windows: check consistency of cl.exe and Generator

8440071d5028c05a742a45d3bcdc7a5a281f1c9c authored over 6 years ago by Hannes Roest <[email protected]>

[FEATURE] fix #74 (check consistency of cl.exe and Generator)

2ef411428891b75d051a4b144dc336c50aa760ac authored over 6 years ago by Chris Bielow <[email protected]>

Merge pull request #73 from OpenMS/feature/boostSystemThread

[Feature] Enable Boost system and thread

86a5cc921a792f6164880c02bd5170bc31bd1483 authored over 6 years ago by Timo Sachsenberg <[email protected]>

Enable Boost system and thread

aec666d49a58a0dfb73c6ffff8e65e56ba30edae authored over 6 years ago by jpfeuffer <[email protected]>

Merge pull request #70 from hroest/fix/svm

[FIX] linux fix

f3122bdbb2540b6b11f93d8d5c1e70bb61e25794 authored over 6 years ago by jpfeuffer <[email protected]>

Merge pull request #72 from jpfeuffer/fix/zlib_rpath

[FIX] fix zlib rpath on Mac right after build

a5f619a45b572c03cfefea83c6ce6012d8562dcc authored over 6 years ago by jpfeuffer <[email protected]>

Update CMakeLists.txt

2bae8806e167d60f754ed042903299baafee8b0c authored over 6 years ago by jpfeuffer <[email protected]>

[FIX] fix zlib rpath on Mac right after build

9f22746506819ed10311a83bb69244eeca4517af authored over 6 years ago by Julianus Pfeuffer <[email protected]>

Merge pull request #71 from jpfeuffer/update/zlib1_2_11

[Update] zlib 1.2.11

f74999a0606c70aee58d8a9841aff4c2054f883c authored almost 7 years ago by Hannes Roest <[email protected]>

Removed unnecessary code. Fixed compile options for mac.

73ec8e58254745f03832342aaad867ecfb793d2d authored almost 7 years ago by jpfeuffer <[email protected]>

Updated zlib to 1.2.11

aef4c13d2198a35a3876ed0a99e126d56b94d88f authored almost 7 years ago by Julianus Pfeuffer <[email protected]>

[FIX] linux fix

97c32db7e17f2b8d60cbf491bc8cde90f5a4ddff authored almost 7 years ago by Hannes Rost <[email protected]>

VS2017 is supported now. Update readme

901961ae7e604ffedbcf6a428915b132d682f827 authored almost 7 years ago by jpfeuffer <[email protected]>

Merge pull request #68 from OpenMS/fix/redhatDirXerces

[FIX] Redhat cmake installs to lib64 by default

db5f98513edd8d091ae0d09758f2e471ae04952c authored almost 7 years ago by jpfeuffer <[email protected]>

Avoid using ICU, which is standard if found.

692ada21f06ba3ea32db9ec4220cdc502af4f755 authored almost 7 years ago by jpfeuffer <[email protected]>

[FIX] Redhat cmake installs to lib64 by default

Overwrite with lib for all Unix platforms.
hopefully fixes #67. I do not have a redhat at hand ...

f56eddc6fec4e4d59ac2c02393ba3072ae364232 authored almost 7 years ago by jpfeuffer <[email protected]>

Merge pull request #66 from OpenMS/fix/xerces-network

[FIX] Disable network support and add fpic to Xerces

ea0f18432f63f38685544a9ee0d38f21e9b794bb authored almost 7 years ago by jpfeuffer <[email protected]>

Add another flag.

82cbc1c51f137c99a102da33d7c9e059f6c48a48 authored almost 7 years ago by jpfeuffer <[email protected]>

Use fPIC flag for static xerces

Since it is default for shared library targets, it should not matter to add it everytime.

b82815798825ad8480bdbf8b32e48a1a6b7aced6 authored almost 7 years ago by jpfeuffer <[email protected]>

[FIX] Disable network support for Xerces as before

At first I thought, "why not", then we could use the online schema lookup of xerces.
But then w...

5ce775e7cb4f403837c35fcda0b58b8c4d2a54ec authored almost 7 years ago by jpfeuffer <[email protected]>

Merge pull request #65 from jpfeuffer/fix/zlibbindir

[HOTFIX] Confused lib and bin dir in zlib. Needs to be the other way round!

d7896da4be9a3e89910afe5b521e17a5b152b3c3 authored almost 7 years ago by jpfeuffer <[email protected]>

[HOTFIX] Confused lib and bin dir in zlib. Needs to be the other way round!

b29b265f0cbfd139d6da150f258bf68edb44a921 authored almost 7 years ago by jpfeuffer <[email protected]>

Merge pull request #64 from jpfeuffer/feature/sqliteWinStatic

[FEATURE] Added default support for static sqlite on win.

49aa6ad4eb41f9a958bc2da53638c079ab878894 authored almost 7 years ago by jpfeuffer <[email protected]>

Merge pull request #63 from jpfeuffer/feature/updateXercesTo3_2

[FEATURE] Update Xerces to 3.2 with CMake buildsystem

85a7a9aa3d05eeebde22be07cdf0f43e8c61f59e authored almost 7 years ago by jpfeuffer <[email protected]>

Merge pull request #62 from OpenMS/fix/zlib_dll_loc

Modify patch to zlib CMakeLists to set the location for dlls to bin on win

965e3b643cfc06dd9bfe4b95af5205da0836f998 authored almost 7 years ago by jpfeuffer <[email protected]>

Added default support for static sqlite on win.

d9e9e479ad032c692907a87ee66584f507085f9f authored almost 7 years ago by jpfeuffer <[email protected]>

Include path to right file in xerces patch

f7d56e613b6aec1a03941fc654e7468f67fde6b9 authored almost 7 years ago by jpfeuffer <[email protected]>

Forgot c in path

120bc022d55dffd6db51fe75ff9a02ecdb1b1be0 authored almost 7 years ago by jpfeuffer <[email protected]>

Omit Debug build on *nix. Omit softlink for static lib. Change suffix on Mac to dylib.

23b8caff4152c171015256d9c336858ad0ea0989 authored almost 7 years ago by jpfeuffer <[email protected]>

No need to copy libs for xerces anymore

45d95f3a3e425a3465f8c177768d233ab50ab61c authored almost 7 years ago by jpfeuffer <[email protected]>

[FEATURE] Update Xerces to 3.2 with CMake buildsystem

f920e3fa55d7ae64f876988bb992574a78adc6a8 authored almost 7 years ago by jpfeuffer <[email protected]>

Modify patch to zlib CMakeLists to set the location for dlls to bin on win

be4815c9194237aa0395ce69ad74163722768200 authored almost 7 years ago by jpfeuffer <[email protected]>

[FIX] fixed typo in eigen patches

2c58ab6c9d0233bff6c0bb0994cf053a69ac9455 authored almost 7 years ago by timosachsenberg <[email protected]>

[FIX] Revert weird merge resolution

8d4cfeb85da44b022c43df76f50095b530f430bb authored almost 7 years ago by jpfeuffer <[email protected]>

Merge pull request #57 from timosachsenberg/feature/update_eigen

Feature/update eigen

0bbdb4a923384efb561a6f4b0e0bdf4df20eeb71 authored almost 7 years ago by Timo Sachsenberg <[email protected]>

Merge branch 'master' into feature/update_eigen

Conflicts:
CMakeLists.txt

3880e14971d7ee691cb8b408154367e8c9e31fe7 authored almost 7 years ago by timosachsenberg <[email protected]>

Merge pull request #59 from OpenMS/update_cmake

update minimum cmake and c11 version

ffab50c7db27275efe517ee53c7c31bd1d1225af authored about 7 years ago by Timo Sachsenberg <[email protected]>

update minimum cmake and c11 version

3e148995ac804c56d2eb4e8a0b9ade0b2fc7366b authored about 7 years ago by Timo Sachsenberg <[email protected]>

Merge branch 'master' into feature/update_eigen

c158d2446c3a9491b9d5dd0bfa9520da14d58133 authored about 7 years ago by Timo Sachsenberg <[email protected]>

Merge branch 'master' into feature/update_eigen

c5ce95765b9152cf81fe91655f48dda5a9a55fa8 authored about 7 years ago by Timo Sachsenberg <[email protected]>

Merge pull request #58 from timosachsenberg/fix/cxx_minor_version

[FIX] set minor compiler version number to zero if none is provided

fb5d8e7403d86a18426a23b2883563407f85b523 authored about 7 years ago by Timo Sachsenberg <[email protected]>

[FIX] set minor compiler version number to zero if none is provided

(e.g. gcc 7)

657fb2f1c5fad84fa36918c95810a46ed48cf649 authored about 7 years ago by timosachsenberg <[email protected]>

Merge pull request #56 from jpfeuffer/fix/coinOrUseOSXSysroot

[FIX] Let CoinOR also use the sysroot flag if given.

5911e414c0a7eb936aa57c5c75248de4536782cf authored about 7 years ago by jpfeuffer <[email protected]>

Merge pull request #48 from hroest/feature/coin

[PATCH] remove pedantic everywhere

c0c4a26035e9c96c00b77ab4ceb3fa3d2c844993 authored about 7 years ago by jpfeuffer <[email protected]>

Revert changes. Seems to work after a restart.

65bef4037af15b0159544a806b1e743920a6f43a authored about 7 years ago by jpfeuffer <[email protected]>

Update eigen.cmake

afa1133814e656a2bf055b160f13490e78b268a6 authored about 7 years ago by jpfeuffer <[email protected]>

Fix eigen cmake command line again

Add Debug output and timeout

8b1f0dfdd24f7f1ef3c04b9bed60fd0bfc8133a3 authored about 7 years ago by jpfeuffer <[email protected]>

Forgot the -p flag

a63801f1ee9990e217bbd98cacf5f0233c6bd9c6 authored about 7 years ago by jpfeuffer <[email protected]>

Eigen workaround. Directly call the installation routine.

We do not want to test Eigen anyway.

6ceb82248a8ecefe8a4eb3ef9371f9fe8cef51be authored about 7 years ago by jpfeuffer <[email protected]>

[FIX] Let CoinOR also use the sysroot flag if given.

86b2e09627b160c2a42fdbcfb25086c88d18fd5f authored about 7 years ago by Julianus Pfeuffer <[email protected]>

Update CMakeList.txt.patch

3c47c6bf2f2e67b2df3c72b73bcd4c77c4ec9116 authored about 7 years ago by Timo Sachsenberg <[email protected]>

Merge branch 'master' of https://github.com/timosachsenberg/contrib

03c4e4a6b94cf2c32079e35011f8766f3e8f0b6e authored about 7 years ago by timosachsenberg <[email protected]>

Merge branch 'master' of https://github.com/timosachsenberg/contrib

7c15852381904b3f12cd932a51d780fe0b4d77ad authored about 7 years ago by timosachsenberg <[email protected]>

Merge branch 'master' of https://github.com/timosachsenberg/contrib

4a21aebf84188f17c7d700296286642a38093be6 authored about 7 years ago by timosachsenberg <[email protected]>

[PATCH] disable tests

1b3cfb5037d5513162df7ff246e55103d060ad70 authored about 7 years ago by timosachsenberg <[email protected]>

Try without build_testing

4dcf8a2345bb4072c4410f84443dc8f3e97adf2c authored about 7 years ago by jpfeuffer <[email protected]>

[FIX] removed workaround as bug has been fixed in recent eigen version

3a9e26bb29f6a76d201fa53a566aa6510ea46c7f authored about 7 years ago by timosachsenberg <[email protected]>

[EIGEN] update eigen version to 3.3.4 to fix bugs related to sparse

vectors

6d60f5d8f1a1e3ede7e3a3d25e83768349668e64 authored about 7 years ago by timosachsenberg <[email protected]>

Merge remote-tracking branch 'upstream/master'

262da922e42842cfe6b77f97d71fb1ed1e44a30b authored about 7 years ago by timosachsenberg <[email protected]>

Merge pull request #54 from mwalzer/master

Update License.txt

1c187829d305daf1ef7e6be8213c989d345c64e6 authored about 7 years ago by Timo Sachsenberg <[email protected]>

Merge pull request #53 from OpenMS/revert-51-revert-50-update_licenses

back to after #50 - license.txt update missing

7113848d8d8f9dd014024d553a3d393e93134f40 authored about 7 years ago by Mathias Walzer <[email protected]>

Revert "Revert "Update licenses""

90e239092a79115e48a99bc65fdea7f76d310bfd authored about 7 years ago by Mathias Walzer <[email protected]>

Update License.txt

f71ab8d57bcbea631758a91d059e2c4015c12eb5 authored about 7 years ago by Mathias Walzer <[email protected]>

Merge pull request #51 from OpenMS/revert-50-update_licenses

Revert "Update licenses"

94d0e2e29a8537e40477c4b32b8c7f5e0a40141e authored about 7 years ago by Mathias Walzer <[email protected]>

Revert "Update licenses"

80be596d9377a9f094f5a1d60a7db77a36035854 authored about 7 years ago by Mathias Walzer <[email protected]>