restore .testbin extension, and move caffe_tool back to "caffe".

(Required as I had to change the tool target names to '.bin' but give
them an OUTPUT_NAME, but the .bin made the test_net tool collide with
the test_net unit test.)

diff --git a/src/caffe/test/CMakeLists.txt b/src/caffe/test/CMakeLists.txt
index cbad0cc..ffcc58f 100644 (file)
--- a/src/caffe/test/CMakeLists.txt
+++ b/src/caffe/test/CMakeLists.txt
@@ -7,7 +7,7 @@ project( Test )
 
 # Configuration
 set(TEST_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/test)    # test executables are going to be placed there
-set(TEST_EXT .bin)               # test executable extension
+set(TEST_EXT .testbin)           # test executable extension
 set(ALL_TEST test${TEST_EXT})    # name of an executable comprising of all tests
 set(RUN_TEST runtest)            # dummy target for running tests
 

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index bb88cfa..0da19fb 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -6,12 +6,13 @@ file(GLOB_RECURSE TOOLS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 #    Build each source file independently
 foreach(source ${TOOLS_SOURCES})
     get_filename_component(name ${source} NAME_WE)
-    add_executable(${name} ${source})
-    target_link_libraries(${name} caffe)
+    add_executable(${name}.bin ${source})
+    set_target_properties(${name}.bin PROPERTIES OUTPUT_NAME ${name})
+    target_link_libraries(${name}.bin caffe)
 
 ###    Install    #################################################################################
 
-    install(TARGETS ${name} DESTINATION tools)
+    install(TARGETS ${name}.bin DESTINATION tools)
 
 
 endforeach(source)

diff --git a/tools/caffe_tool.cpp b/tools/caffe.cpp
similarity index 100%
rename from tools/caffe_tool.cpp
rename to tools/caffe.cpp