Changing CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR

7 files changed, 26 insertions, 26 deletions

diff --git a/cmake/ConfigGen.cmake b/cmake/ConfigGen.cmake
index b7cf9f4c..c82047dc 100644
--- a/cmake/ConfigGen.cmake
+++ b/cmake/ConfigGen.cmake
@@ -7,8 +7,8 @@ function(caffe_get_current_includes includes_variable)
   get_property(current_includes DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
   caffe_convert_absolute_paths(current_includes)
 
-  # remove at most one ${CMAKE_BINARY_DIR} include added for caffe_config.h
-  list(FIND current_includes ${CMAKE_BINARY_DIR} __index)
+  # remove at most one ${PROJECT_BINARY_DIR} include added for caffe_config.h
+  list(FIND current_includes ${PROJECT_BINARY_DIR} __index)
   list(REMOVE_AT current_includes ${__index})
 
   caffe_list_unique(current_includes)
@@ -55,17 +55,17 @@ function(caffe_generate_export_configs)
     list(APPEND Caffe_DEFINITIONS -DUSE_MKL)
   endif()
 
-  configure_file("cmake/Templates/CaffeConfig.cmake.in" "${CMAKE_BINARY_DIR}/CaffeConfig.cmake" @ONLY)
+  configure_file("cmake/Templates/CaffeConfig.cmake.in" "${PROJECT_BINARY_DIR}/CaffeConfig.cmake" @ONLY)
 
   # Add targets to the build-tree export set
-  export(TARGETS caffe proto FILE "${CMAKE_BINARY_DIR}/CaffeTargets.cmake")
+  export(TARGETS caffe proto FILE "${PROJECT_BINARY_DIR}/CaffeTargets.cmake")
   export(PACKAGE Caffe)
 
   # ---[ Configure install-tree CaffeConfig.cmake file ]---
 
   # remove source and build dir includes
-  caffe_get_items_with_prefix(${CMAKE_SOURCE_DIR} Caffe_INCLUDE_DIRS __insource)
-  caffe_get_items_with_prefix(${CMAKE_BINARY_DIR} Caffe_INCLUDE_DIRS __inbinary)
+  caffe_get_items_with_prefix(${PROJECT_SOURCE_DIR} Caffe_INCLUDE_DIRS __insource)
+  caffe_get_items_with_prefix(${PROJECT_BINARY_DIR} Caffe_INCLUDE_DIRS __inbinary)
   list(REMOVE_ITEM Caffe_INCLUDE_DIRS ${__insource} ${__inbinary})
 
   # add `install` include folder
@@ -75,10 +75,10 @@ function(caffe_generate_export_configs)
      "unset(__caffe_include)\n")
   string(REPLACE ";" "" Caffe_INSTALL_INCLUDE_DIR_APPEND_COMMAND ${lines})
 
-  configure_file("cmake/Templates/CaffeConfig.cmake.in" "${CMAKE_BINARY_DIR}/cmake/CaffeConfig.cmake" @ONLY)
+  configure_file("cmake/Templates/CaffeConfig.cmake.in" "${PROJECT_BINARY_DIR}/cmake/CaffeConfig.cmake" @ONLY)
 
   # Install the CaffeConfig.cmake and export set to use wuth install-tree
-  install(FILES "${CMAKE_BINARY_DIR}/cmake/CaffeConfig.cmake" DESTINATION ${install_cmake_suffix})
+  install(FILES "${PROJECT_BINARY_DIR}/cmake/CaffeConfig.cmake" DESTINATION ${install_cmake_suffix})
   install(EXPORT CaffeTargets DESTINATION ${install_cmake_suffix})
 
   # ---[ Configure and install version file ]---
@@ -86,8 +86,8 @@ function(caffe_generate_export_configs)
   # TODO: Lines below are commented because Caffe does't declare its version in headers.
   # When the declarations are added, modify `caffe_extract_caffe_version()` macro and uncomment
 
-  # configure_file(cmake/Templates/CaffeConfigVersion.cmake.in "${CMAKE_BINARY_DIR}/CaffeConfigVersion.cmake" @ONLY)
-  # install(FILES "${CMAKE_BINARY_DIR}/CaffeConfigVersion.cmake" DESTINATION ${install_cmake_suffix})
+  # configure_file(cmake/Templates/CaffeConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CaffeConfigVersion.cmake" @ONLY)
+  # install(FILES "${PROJECT_BINARY_DIR}/CaffeConfigVersion.cmake" DESTINATION ${install_cmake_suffix})
 endfunction()
 
 
diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake
index 07fa1378..ff58d31c 100644
--- a/cmake/Cuda.cmake
+++ b/cmake/Cuda.cmake
@@ -12,7 +12,7 @@ set(Caffe_known_gpu_archs "20 21(20) 30 35 50")
 #   caffe_detect_installed_gpus(out_variable)
 function(caffe_detect_installed_gpus out_variable)
   if(NOT CUDA_gpu_detect_output)
-    set(__cufile ${CMAKE_BINARY_DIR}/detect_cuda_archs.cu)
+    set(__cufile ${PROJECT_BINARY_DIR}/detect_cuda_archs.cu)
 
     file(WRITE ${__cufile} ""
       "#include <cstdio>\n"
@@ -31,7 +31,7 @@ function(caffe_detect_installed_gpus out_variable)
       "}\n")
 
     execute_process(COMMAND "${CUDA_NVCC_EXECUTABLE}" "--run" "${__cufile}"
-                    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/CMakeFiles/"
+                    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/CMakeFiles/"
                     RESULT_VARIABLE __nvcc_res OUTPUT_VARIABLE __nvcc_out
                     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
diff --git a/cmake/Misc.cmake b/cmake/Misc.cmake
index 14eaeb0a..608a5f13 100644
--- a/cmake/Misc.cmake
+++ b/cmake/Misc.cmake
@@ -25,7 +25,7 @@ endif()
 
 # ---[ Install options
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Default install path" FORCE)
+  set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/install" CACHE PATH "Default install path" FORCE)
 endif()
 
 # ---[ RPATH settings
@@ -34,8 +34,8 @@ set(CMAKE_MACOSX_RPATH TRUE)
 
 # ---[ Funny target
 if(UNIX OR APPLE)
-  add_custom_target(symlink_to_build COMMAND "ln" "-sf" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/build"
-                                     COMMENT "Adding symlink: <caffe_root>/build -> ${CMAKE_BINARY_DIR}" )
+  add_custom_target(symlink_to_build COMMAND "ln" "-sf" "${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/build"
+                                     COMMENT "Adding symlink: <caffe_root>/build -> ${PROJECT_BINARY_DIR}" )
 endif()
 
 # ---[ Set debug postfix
diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake
index bb63c9ed..8946d66c 100644
--- a/cmake/ProtoBuf.cmake
+++ b/cmake/ProtoBuf.cmake
@@ -22,8 +22,8 @@ if(PROTOBUF_FOUND)
 endif()
 
 # place where to generate protobuf sources
-set(proto_gen_folder "${CMAKE_BINARY_DIR}/include/caffe/proto")
-include_directories(SYSTEM "${CMAKE_BINARY_DIR}/include")
+set(proto_gen_folder "${PROJECT_BINARY_DIR}/include/caffe/proto")
+include_directories(SYSTEM "${PROJECT_BINARY_DIR}/include")
 
 set(PROTOBUF_GENERATE_CPP_APPEND_PATH TRUE)
 
diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake
index 756a738c..3f7dff6b 100644
--- a/cmake/Summary.cmake
+++ b/cmake/Summary.cmake
@@ -65,7 +65,7 @@ function(caffe_extract_caffe_version)
   if(GIT_FOUND)
     execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty
                     ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
-                    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+                    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
                     OUTPUT_VARIABLE Caffe_GIT_VERSION
                     RESULT_VARIABLE __git_result)
     if(NOT ${__git_result} EQUAL 0)
diff --git a/cmake/Targets.cmake b/cmake/Targets.cmake
index 3b254ad3..e3ad8723 100644
--- a/cmake/Targets.cmake
+++ b/cmake/Targets.cmake
@@ -53,7 +53,7 @@ function(caffe_pickup_caffe_sources root)
   # put all files in source groups (visible as subfolder in many IDEs)
   caffe_source_group("Include"        GLOB "${root}/include/caffe/*.h*")
   caffe_source_group("Include\\Util"  GLOB "${root}/include/caffe/util/*.h*")
-  caffe_source_group("Include"        GLOB "${CMAKE_BINARY_DIR}/caffe_config.h*")
+  caffe_source_group("Include"        GLOB "${PROJECT_BINARY_DIR}/caffe_config.h*")
   caffe_source_group("Source"         GLOB "${root}/src/caffe/*.cpp")
   caffe_source_group("Source\\Util"   GLOB "${root}/src/caffe/util/*.cpp")
   caffe_source_group("Source\\Layers" GLOB "${root}/src/caffe/layers/*.cpp")
@@ -75,7 +75,7 @@ function(caffe_pickup_caffe_sources root)
   list(REMOVE_ITEM  srcs ${test_srcs})
 
   # adding headers to make the visible in some IDEs (Qt, VS, Xcode)
-  list(APPEND srcs ${hdrs} ${CMAKE_BINARY_DIR}/caffe_config.h)
+  list(APPEND srcs ${hdrs} ${PROJECT_BINARY_DIR}/caffe_config.h)
   list(APPEND test_srcs ${test_hdrs})
 
   # collect cuda files
@@ -107,9 +107,9 @@ endfunction()
 function(caffe_default_properties target)
   set_target_properties(${target} PROPERTIES
     DEBUG_POSTFIX ${Caffe_DEBUG_POSTFIX}
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+    ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
+    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 endfunction()
 
 ################################################################################################
@@ -139,7 +139,7 @@ function(caffe_configure_testdatafile file)
   file(STRINGS ${file} __lines)
   set(result "")
   foreach(line ${__lines})
-    set(result "${result}${CMAKE_SOURCE_DIR}/${line}\n")
+    set(result "${result}${PROJECT_SOURCE_DIR}/${line}\n")
   endforeach()  
   file(WRITE ${file}.gen.cmake ${result})
 endfunction()
diff --git a/cmake/Templates/caffe_config.h.in b/cmake/Templates/caffe_config.h.in
index 6aa22ed7..6039e8f6 100644
--- a/cmake/Templates/caffe_config.h.in
+++ b/cmake/Templates/caffe_config.h.in
@@ -1,8 +1,8 @@
 /* Sources directory */
-#define SOURCE_FOLDER "${CMAKE_SOURCE_DIR}"
+#define SOURCE_FOLDER "${PROJECT_SOURCE_DIR}"
 
 /* Binaries directory */
-#define BINARY_FOLDER "${CMAKE_BINARY_DIR}"
+#define BINARY_FOLDER "${PROJECT_BINARY_DIR}"
 
 /* NVIDA Cuda */
 #cmakedefine HAVE_CUDA