use all caps for global preprocess vars (e.g. EXAMPLES_SOURCE_DIR), and

other minor cleanup

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index ec3cc47..055f4ef 100644 (file)
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,8 +1,8 @@
 project( Examples )
 
-file(GLOB_RECURSE Examples_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+file(GLOB_RECURSE EXAMPLES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
-foreach(source ${Examples_SOURCES})
+foreach(source ${EXAMPLES_SOURCES})
     #    get file name
     get_filename_component(name ${source} NAME_WE)  
     

diff --git a/include/caffe/test/test_caffe_main.hpp b/include/caffe/test/test_caffe_main.hpp
index e02e67e..438acf2 100644 (file)
--- a/include/caffe/test/test_caffe_main.hpp
+++ b/include/caffe/test/test_caffe_main.hpp
@@ -19,7 +19,7 @@ using std::endl;
 #else
   #define CUDA_TEST_DEVICE -1
   #define CMAKE_SOURCE_DIR "src/"
-  #define Examples_SOURCE_DIR "examples/"
+  #define EXAMPLES_SOURCE_DIR "examples/"
   #define CMAKE_EXT ""
 #endif
 

diff --git a/src/caffe/test/cmake_test_defines.hpp.in b/src/caffe/test/cmake_test_defines.hpp.in
index 2d67df4..870eaf5 100644 (file)
--- a/src/caffe/test/cmake_test_defines.hpp.in
+++ b/src/caffe/test/cmake_test_defines.hpp.in
@@ -1,5 +1,4 @@
-
 #define CUDA_TEST_DEVICE @CUDA_TEST_DEVICE@
 #define CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/src/"
-#define Examples_SOURCE_DIR "@CMAKE_SOURCE_DIR@/examples/"
-#define CMAKE_EXT ".gen.cmake"
\ No newline at end of file
+#define EXAMPLES_SOURCE_DIR "@CMAKE_SOURCE_DIR@/examples/"
+#define CMAKE_EXT ".gen.cmake"

diff --git a/src/caffe/test/test_image_data_layer.cpp b/src/caffe/test/test_image_data_layer.cpp
index 17d67bd..73be5da 100644 (file)
--- a/src/caffe/test/test_image_data_layer.cpp
+++ b/src/caffe/test/test_image_data_layer.cpp
@@ -37,7 +37,7 @@ class ImageDataLayerTest : public MultiDeviceTest<TypeParam> {
     std::ofstream outfile(filename_->c_str(), std::ofstream::out);
     LOG(INFO) << "Using temporary file " << *filename_;
     for (int i = 0; i < 5; ++i) {
-      outfile << Examples_SOURCE_DIR "images/cat.jpg " << i;
+      outfile << EXAMPLES_SOURCE_DIR "images/cat.jpg " << i;
     }
     outfile.close();
   }

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 81ecf7c..bb88cfa 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,10 +1,10 @@
 project( Tools )
 
 #    Find all source files
-file(GLOB_RECURSE Tools_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+file(GLOB_RECURSE TOOLS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
 #    Build each source file independently
-foreach(source ${Tools_SOURCES})
+foreach(source ${TOOLS_SOURCES})
     get_filename_component(name ${source} NAME_WE)
     add_executable(${name} ${source})
     target_link_libraries(${name} caffe)