summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Garvey <darren.garvey@gmail.com>2015-09-01 15:42:26 +0100
committerDarren Garvey <darren.garvey@gmail.com>2015-09-01 22:43:30 +0100
commitb04000e4204753803f4cdead66af8a830bc7c4ca (patch)
treea342b350187b3758a5cf2f120661ed5dc0f1e913
parent2d55e31ff5efd2653aa3440295857f4850a4b7f1 (diff)
downloadcaffeonacl-b04000e4204753803f4cdead66af8a830bc7c4ca.tar.gz
caffeonacl-b04000e4204753803f4cdead66af8a830bc7c4ca.tar.bz2
caffeonacl-b04000e4204753803f4cdead66af8a830bc7c4ca.zip
Cleanup: Fixup capitalisation of Caffe_POSTFIX.
Replaces CAffe_POSTFIX -> Caffe_POSTFIX.
-rw-r--r--cmake/Misc.cmake4
-rw-r--r--examples/CMakeLists.txt2
-rw-r--r--matlab/CMakeLists.txt4
-rw-r--r--python/CMakeLists.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Misc.cmake b/cmake/Misc.cmake
index 7676754f..9dd2609b 100644
--- a/cmake/Misc.cmake
+++ b/cmake/Misc.cmake
@@ -46,7 +46,7 @@ endif()
# ---[ Set debug postfix
set(Caffe_DEBUG_POSTFIX "-d")
-set(CAffe_POSTFIX "")
+set(Caffe_POSTFIX "")
if(CMAKE_BUILD_TYPE MATCHES "Debug")
- set(CAffe_POSTFIX ${Caffe_DEBUG_POSTFIX})
+ set(Caffe_POSTFIX ${Caffe_DEBUG_POSTFIX})
endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index f29fc7e5..663d7360 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -24,7 +24,7 @@ foreach(source_file ${examples_srcs})
if(UNIX OR APPLE)
# Funny command to make tutorials work
# TODO: remove in future as soon as naming is standartaized everywhere
- set(__outname ${PROJECT_BINARY_DIR}/examples/${folder}/${name}${CAffe_POSTFIX})
+ set(__outname ${PROJECT_BINARY_DIR}/examples/${folder}/${name}${Caffe_POSTFIX})
add_custom_command(TARGET ${name} POST_BUILD
COMMAND ln -sf "${__outname}" "${__outname}.bin")
endif()
diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt
index 4b0d549f..f420df8d 100644
--- a/matlab/CMakeLists.txt
+++ b/matlab/CMakeLists.txt
@@ -43,7 +43,7 @@ string(REPLACE ";" ";-L" link_folders "-L${folders}")
string(REPLACE ";" ":" rpath_folders "${folders}")
if(build_using MATCHES "Matlab")
- set(libflags -lcaffe${CAffe_POSTFIX} ${libflags}) # Matlab R2014a complans for -Wl,--whole-archive
+ set(libflags -lcaffe${Caffe_POSTFIX} ${libflags}) # Matlab R2014a complans for -Wl,--whole-archive
caffe_fetch_and_set_proper_mexext(Matlab_caffe_mex)
add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Matlab_mex}
@@ -56,7 +56,7 @@ elseif(build_using MATCHES "Octave")
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(libflags -Wl,-force_load,$<TARGET_LINKER_FILE:caffe> ${libflags})
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- set(libflags -Wl,--whole-archive -lcaffe${CAffe_POSTFIX} -Wl,--no-whole-archive ${libflags})
+ set(libflags -Wl,--whole-archive -lcaffe${Caffe_POSTFIX} -Wl,--no-whole-archive ${libflags})
endif()
add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Octave_compiler}
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index df0401da..0e2bc7e6 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -18,7 +18,7 @@ if(UNIX OR APPLE)
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/python/caffe/proto
COMMAND touch ${PROJECT_SOURCE_DIR}/python/caffe/proto/__init__.py
COMMAND cp ${proto_gen_folder}/*.py ${PROJECT_SOURCE_DIR}/python/caffe/proto/
- COMMENT "Creating symlink ${__linkname} -> ${PROJECT_BINARY_DIR}/lib/_caffe${CAffe_POSTFIX}.so")
+ COMMENT "Creating symlink ${__linkname} -> ${PROJECT_BINARY_DIR}/lib/_caffe${Caffe_POSTFIX}.so")
endif()
# ---[ Install