File tree 4 files changed +6
-6
lines changed
4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ endif()
46
46
# ---[ Set debug postfix
47
47
set (Caffe_DEBUG_POSTFIX "-d" )
48
48
49
- set (CAffe_POSTFIX "" )
49
+ set (Caffe_POSTFIX "" )
50
50
if (CMAKE_BUILD_TYPE MATCHES "Debug" )
51
- set (CAffe_POSTFIX ${Caffe_DEBUG_POSTFIX} )
51
+ set (Caffe_POSTFIX ${Caffe_DEBUG_POSTFIX} )
52
52
endif ()
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ foreach(source_file ${examples_srcs})
24
24
if (UNIX OR APPLE )
25
25
# Funny command to make tutorials work
26
26
# TODO: remove in future as soon as naming is standartaized everywhere
27
- set (__outname ${PROJECT_BINARY_DIR} /examples/${folder} /${name}${CAffe_POSTFIX } )
27
+ set (__outname ${PROJECT_BINARY_DIR} /examples/${folder} /${name}${Caffe_POSTFIX } )
28
28
add_custom_command (TARGET ${name} POST_BUILD
29
29
COMMAND ln -sf "${__outname} " "${__outname} .bin" )
30
30
endif ()
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ string(REPLACE ";" ";-L" link_folders "-L${folders}")
43
43
string (REPLACE ";" ":" rpath_folders "${folders} " )
44
44
45
45
if (build_using MATCHES "Matlab" )
46
- set (libflags -lcaffe${CAffe_POSTFIX } ${libflags} ) # Matlab R2014a complans for -Wl,--whole-archive
46
+ set (libflags -lcaffe${Caffe_POSTFIX } ${libflags} ) # Matlab R2014a complans for -Wl,--whole-archive
47
47
48
48
caffe_fetch_and_set_proper_mexext(Matlab_caffe_mex)
49
49
add_custom_command (OUTPUT ${Matlab_caffe_mex} COMMAND ${Matlab_mex}
@@ -56,7 +56,7 @@ elseif(build_using MATCHES "Octave")
56
56
if ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "Clang" )
57
57
set (libflags -Wl,-force_load,$<TARGET_LINKER_FILE:caffe> ${libflags} )
58
58
elseif ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "GNU" )
59
- set (libflags -Wl,--whole-archive -lcaffe${CAffe_POSTFIX } -Wl,--no -whole-archive ${libflags} )
59
+ set (libflags -Wl,--whole-archive -lcaffe${Caffe_POSTFIX } -Wl,--no -whole-archive ${libflags} )
60
60
endif ()
61
61
62
62
add_custom_command (OUTPUT ${Matlab_caffe_mex} COMMAND ${Octave_compiler}
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ if(UNIX OR APPLE)
18
18
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR} /python/caffe/proto
19
19
COMMAND touch ${PROJECT_SOURCE_DIR} /python/caffe/proto/__init__.py
20
20
COMMAND cp ${proto_gen_folder} /*.py ${PROJECT_SOURCE_DIR} /python/caffe/proto/
21
- COMMENT "Creating symlink ${__linkname} -> ${PROJECT_BINARY_DIR} /lib/_caffe${CAffe_POSTFIX } .so" )
21
+ COMMENT "Creating symlink ${__linkname} -> ${PROJECT_BINARY_DIR} /lib/_caffe${Caffe_POSTFIX } .so" )
22
22
endif ()
23
23
24
24
# ---[ Install
You can’t perform that action at this time.
0 commit comments