Граф коммитов

32 Коммитов

Автор SHA1 Сообщение Дата
Evan Shelhamer 0c89b38b14 Merge pull request #3451 from intelcaffe/cmake-clang-fix
Fix to cmake build for clang on linux
2016-02-11 13:19:50 -08:00
Luke Yeager 67b497d4ec Version 1.0.0-rc3 2016-01-22 16:55:27 -08:00
Jacek Czaja 12f85982c4 - Fix to cmake build for clang 2015-12-14 17:37:05 +01:00
Evan Shelhamer a7b2e14d36 Merge pull request #3221 from BonsaiAI/cmake-forward-compatibility
Endorse CMP0046, CMP0054
2015-10-24 17:05:12 -07:00
T.E.A de Souza 1caaf38370 Endorse CMP0046, CMP0054
Set policies to NEW to silence warnings in CMake 3.02 and later.
2015-10-20 11:38:57 +08:00
Luke Yeager b93afe8378 Add ALLOW_LMDB_NOLOCK build option
This option lets you open LMDB files with the MDB_NOLOCK flag. You
should not set this flag if you will be reading LMDBs with any
possibility of simultaneous read and write.
2015-09-25 15:55:40 -07:00
Luke Yeager aaf4a45576 Re-ordering some lines in build files
Enforcing a consistent ordering - OpenCV, LevelDB, LMDB

This will allow me to add the ALLOW_LMDB_NOLOCK option just after the
USE_LMDB option, while keeping the IO dependency options together.
2015-09-25 15:55:40 -07:00
Tea 2349c6de69 Fix case in CMake notices 2015-09-17 15:08:31 +08:00
Tea f3a933a620 Separate IO dependencies
OpenCV, LMDB, LevelDB and Snappy are made optional via switches
(USE_OPENCV, USE_LMDB, USE_LEVELDB) available for Make and CMake
builds. Since Snappy is a LevelDB dependency, its use is determined by
USE_LEVELDB. HDF5 is left bundled because it is used for serializing
weights and solverstates.
2015-09-17 15:08:29 +08:00
philkr 4d3b1844fc Travis scripts for python3 and pytest for cmake. Also fixes CUDA CMake build issue #2722. 2015-07-20 21:33:33 -07:00
Luke Yeager a08bfb5c92 Fix CMake typos
No functional changes, just fixing whitespace errors and typos in
comments
2015-07-07 21:30:33 -07:00
Nuno Subtil 10ddfd32cb Build gflags and glog through CMake if not found in the system
This adds functionality to fetch gflags and glog from GitHub and build
them during the Caffe build. This happens only if a system-wide
installed version is not found (i.e., when find_package() fails).

If built as part of the Caffe build, gflags and glog are compiled as
position-independent static libraries. This avoids doing a system-wide
install of these libraries during the Caffe install target.
2015-04-01 19:15:42 -07:00
philkr 3d30510a50 Making python layer work with cmake 2015-03-06 16:58:18 -08:00
Jon Long b915f9d2bb Merge pull request #1923 from philkr/python3_master
Making python3 work with cmake and the new python wrapper
2015-02-24 15:00:58 -08:00
philkr 54037d3942 Making python3 work with cmake and the new python wrapper 2015-02-24 14:06:36 -08:00
spmallick 845f9eac2b APPLE was misspelled. in Line 27 2015-02-23 16:13:20 -08:00
philkr d1238e14fa Changing CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR 2015-02-18 09:27:13 -08:00
Anatoly Baksheev aea5dd674a cmake 2.8.7. support 2015-02-16 20:48:41 -08:00
Anatoly Baksheev 9358247014 improve CMake build 2015-02-16 20:48:16 -08:00
Kevin James Matzen 94394a059c Fixed CMakeList to work with OpenCV 3. 2014-10-11 15:25:47 -04:00
Martin Baeuml 84a5b8bb9a [cmake] move dependency finding to root CMakeLists.txt
In this way, custom include directories for the dependencies are
also available for tools/ and the bindings.  This is necessary for
example when someone is using custom built dependencies which are
not installed in the system's default directories (e.g. OpenCV includes
are required in tools/ through io.hpp)
2014-10-07 10:37:14 +02:00
Evan Shelhamer 1e9681f915 [fix] set cmake static link command for clang++ and g++ globally 2014-10-03 13:30:21 -07:00
Jeff Donahue f036ef4ded add -fPIC flag to CMake build 2014-09-11 17:27:46 +02:00
Adam Kosiorek 9f9b013813 added gflags + bugfixes + rebase on bvlc/caffe
* added gflags requirement in CMake
* fixed a bug that linked some tests into caffe lib
* renamed tools/caffe due to conflicting target names with caffe lib
* rebased onto bvlc/caffe
2014-08-17 01:07:17 -07:00
Adam Kosiorek f2f3b4c712 Added lint target 2014-08-17 01:07:17 -07:00
Adam Kosiorek bad9d1ea0d added proper 'runtest' target 2014-08-17 01:07:17 -07:00
Adam Kosiorek 15f0a5ed52 Examples_SOURCE_DIR cmake variable bugfix
* it was set only when BUILD_EXAMPLES==OFF
2014-08-17 01:07:17 -07:00
Adam Kosiorek f83407d4c0 cpu only build works 2014-08-17 01:07:17 -07:00
Adam Kosiorek edc493a3e4 cpu only 2014-08-17 01:07:17 -07:00
Adam Kosiorek 68ae1ab7f2 cmake from binaries 2014-08-17 01:07:16 -07:00
Adam Kosiorek a2a4d636c9 cmake build configuration for travis-ci 2014-08-17 01:07:16 -07:00
Adam Kosiorek ececfc0c0c cmake build system 2014-08-17 01:07:11 -07:00