Skip to content

Commit b04000e

Browse files
committed
Cleanup: Fixup capitalisation of Caffe_POSTFIX.
Replaces CAffe_POSTFIX -> Caffe_POSTFIX.
1 parent 2d55e31 commit b04000e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

cmake/Misc.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ endif()
4646
# ---[ Set debug postfix
4747
set(Caffe_DEBUG_POSTFIX "-d")
4848

49-
set(CAffe_POSTFIX "")
49+
set(Caffe_POSTFIX "")
5050
if(CMAKE_BUILD_TYPE MATCHES "Debug")
51-
set(CAffe_POSTFIX ${Caffe_DEBUG_POSTFIX})
51+
set(Caffe_POSTFIX ${Caffe_DEBUG_POSTFIX})
5252
endif()

examples/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ foreach(source_file ${examples_srcs})
2424
if(UNIX OR APPLE)
2525
# Funny command to make tutorials work
2626
# 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})
2828
add_custom_command(TARGET ${name} POST_BUILD
2929
COMMAND ln -sf "${__outname}" "${__outname}.bin")
3030
endif()

matlab/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ string(REPLACE ";" ";-L" link_folders "-L${folders}")
4343
string(REPLACE ";" ":" rpath_folders "${folders}")
4444

4545
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
4747

4848
caffe_fetch_and_set_proper_mexext(Matlab_caffe_mex)
4949
add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Matlab_mex}
@@ -56,7 +56,7 @@ elseif(build_using MATCHES "Octave")
5656
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
5757
set(libflags -Wl,-force_load,$<TARGET_LINKER_FILE:caffe> ${libflags})
5858
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})
6060
endif()
6161

6262
add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Octave_compiler}

python/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if(UNIX OR APPLE)
1818
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/python/caffe/proto
1919
COMMAND touch ${PROJECT_SOURCE_DIR}/python/caffe/proto/__init__.py
2020
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")
2222
endif()
2323

2424
# ---[ Install

0 commit comments

Comments
 (0)