diff options
author | Adam Kosiorek <a.kosiorek@samsung.com> | 2014-07-29 10:40:40 +0200 |
---|---|---|
committer | Jeff Donahue <jeff.donahue@gmail.com> | 2014-08-17 01:07:17 -0700 |
commit | 9f9b013813dc02c0ab86043e0b7a385c69e1b4f7 (patch) | |
tree | e2584593b4409a849c3c3bf77f81bd38125b0eee /CMakeLists.txt | |
parent | f2f3b4c71210958125d4945442641e0305fbeba9 (diff) | |
download | caffeonacl-9f9b013813dc02c0ab86043e0b7a385c69e1b4f7.tar.gz caffeonacl-9f9b013813dc02c0ab86043e0b7a385c69e1b4f7.tar.bz2 caffeonacl-9f9b013813dc02c0ab86043e0b7a385c69e1b4f7.zip |
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
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8df7412b..64250eea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,9 @@ endif() ### Configuration ########################################################################### # Compiler Flags set(CMAKE_CXX_COMPILER_FLAGS ${CMAKE_CXX_COMPILER_FLAGS} -Wall) -set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIC) -set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} )#-O3) +set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )#set global flags here) +set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG} )#set debug flags here) +set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} )#set release flags here) # Global Definitions if(CPU_ONLY) |