You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
2.2 KiB
57 lines
2.2 KiB
10 years ago
|
Index: cmake/ConfigGen.cmake
|
||
|
|
--- cmake/ConfigGen.cmake.orig 2016-05-26 18:19:53.000000000 +0200
|
||
|
|
+++ cmake/ConfigGen.cmake 2016-05-27 00:45:23.501493706 +0200
|
||
|
|
@@ -85,7 +85,6 @@
|
||
|
|
|
||
|
|
# Add targets to the build-tree export set
|
||
|
|
export(TARGETS caffe proto FILE "${PROJECT_BINARY_DIR}/CaffeTargets.cmake")
|
||
|
|
- export(PACKAGE Caffe)
|
||
|
|
|
||
|
|
# ---[ Configure install-tree CaffeConfig.cmake file ]---
|
||
|
|
|
||
|
|
Index: cmake/Dependencies.cmake
|
||
|
|
--- cmake/Dependencies.cmake.orig 2016-05-26 18:19:53.000000000 +0200
|
||
|
|
+++ cmake/Dependencies.cmake 2016-05-27 00:46:12.371413556 +0200
|
||
|
|
@@ -13,7 +13,7 @@
|
||
|
|
# ---[ Google-glog
|
||
|
|
include("cmake/External/glog.cmake")
|
||
|
|
include_directories(SYSTEM ${GLOG_INCLUDE_DIRS})
|
||
|
|
-list(APPEND Caffe_LINKER_LIBS ${GLOG_LIBRARIES})
|
||
|
|
+list(APPEND Caffe_LINKER_LIBS ${GLOG_LIBRARIES} -lexecinfo)
|
||
|
|
|
||
|
|
# ---[ Google-gflags
|
||
|
|
include("cmake/External/gflags.cmake")
|
||
|
|
Index: cmake/External/glog.cmake
|
||
|
|
--- cmake/External/glog.cmake.orig 2016-05-26 18:19:53.000000000 +0200
|
||
|
|
+++ cmake/External/glog.cmake 2016-05-27 00:45:23.501493706 +0200
|
||
|
|
@@ -45,7 +45,7 @@
|
||
|
|
|
||
|
|
set(GLOG_FOUND TRUE)
|
||
|
|
set(GLOG_INCLUDE_DIRS ${glog_INSTALL}/include)
|
||
|
|
- set(GLOG_LIBRARIES ${GFLAGS_LIBRARIES} ${glog_INSTALL}/lib/libglog.a)
|
||
|
|
+ set(GLOG_LIBRARIES ${GFLAGS_LIBRARIES} ${glog_INSTALL}/lib/libglog.a ${glog_INSTALL}/lib/libexecinfo.a)
|
||
|
|
set(GLOG_LIBRARY_DIRS ${glog_INSTALL}/lib)
|
||
|
|
set(GLOG_EXTERNAL TRUE)
|
||
|
|
|
||
|
|
Index: cmake/Summary.cmake
|
||
|
|
--- cmake/Summary.cmake.orig 2016-05-26 18:19:53.000000000 +0200
|
||
|
|
+++ cmake/Summary.cmake 2016-05-27 00:45:23.501493706 +0200
|
||
|
|
@@ -61,17 +61,6 @@
|
||
|
|
# caffe_extract_caffe_version()
|
||
|
|
function(caffe_extract_caffe_version)
|
||
|
|
set(Caffe_GIT_VERSION "unknown")
|
||
|
|
- find_package(Git)
|
||
|
|
- if(GIT_FOUND)
|
||
|
|
- execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty
|
||
|
|
- ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
|
||
|
|
- WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
|
||
|
|
- OUTPUT_VARIABLE Caffe_GIT_VERSION
|
||
|
|
- RESULT_VARIABLE __git_result)
|
||
|
|
- if(NOT ${__git_result} EQUAL 0)
|
||
|
|
- set(Caffe_GIT_VERSION "unknown")
|
||
|
|
- endif()
|
||
|
|
- endif()
|
||
|
|
|
||
|
|
set(Caffe_GIT_VERSION ${Caffe_GIT_VERSION} PARENT_SCOPE)
|
||
|
|
set(Caffe_VERSION "<TODO> (Caffe doesn't declare its version in headers)" PARENT_SCOPE)
|