Examples_SOURCE_DIR cmake variable bugfix

* it was set only when BUILD_EXAMPLES==OFF

diff --git a/.travis.yml b/.travis.yml
index 1883c08..26d435b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,11 +50,11 @@ script:
   # CMake build.
   - mkdir build
   - cd build
-    ## CPU-GPU build
+  ## CPU-GPU: build only.
   - cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release ..
   - make --keep-going --jobs=$NUM_THREADS
   - make clean && rm -rf *
-    ## CPU-only build
+   ## CPU-only: comprehensive
   - cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release -DCPU_ONLY=ON ..
   - make --keep-going --jobs=$NUM_THREADS
   - cd test && ./test --gtest_shuffle --gtest_filter="-*GPU*" && cd -
@@ -62,12 +62,13 @@ script:
     ## Cleaning
   - cd ..
   - rm -r build
-
-  # CPU-GPU: build only.
+  
+  # Make build
+  ## CPU-GPU: build only.
   - export CPU_ONLY=0
   - make --keep-going --jobs=$NUM_THREADS all
   - make clean
-  # CPU-only: comprehensive.
+  ## CPU-only: comprehensive.
   - export CPU_ONLY=1
   - make --keep-going --jobs=$NUM_THREADS all test warn lint
   - make runtest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d8e82d..0cf08fe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,8 +61,6 @@ add_subdirectory(tools)
 if(BUILD_EXAMPLES)
     message(STATUS "Examples enabled")
     add_subdirectory(examples)
-else()
-    set(Examples_SOURCE_DIR ${CMAKE_SOURCE_DIR}/examples)
 endif()
 
 if(BUILD_PYTHON)

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