Merge commit '224422eed6813c15b3c3b2c0dcd5e0187ec660a1'

sepehrmn · Dec 31, 2016 · d2bb566 · d2bb566
2 parents 3c26f7a + 224422e
commit d2bb566
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/torch/lib/THC/CMakeLists.txt b/torch/lib/THC/CMakeLists.txt
@@ -112,10 +112,19 @@ IF(NOT THC_INSTALL_BIN_SUBDIR
   INCLUDE_DIRECTORIES(${TH_INCLUDE_PATH} ${TH_INCLUDE_PATH}/TH)
   LINK_DIRECTORIES(${TH_LIB_PATH})
 
-  SET(THC_INSTALL_BIN_SUBDIR ${Torch_INSTALL_BIN_SUBDIR})
-  SET(THC_INSTALL_LIB_SUBDIR ${Torch_INSTALL_LIB_SUBDIR})
-  SET(THC_INSTALL_INCLUDE_SUBDIR ${Torch_INSTALL_INCLUDE_SUBDIR})
-  SET(THC_INSTALL_CMAKE_SUBDIR ${Torch_INSTALL_CMAKE_SUBDIR})
+  IF(Torch_INSTALL_BIN_SUBDIR)
+    SET(THC_INSTALL_BIN_SUBDIR ${Torch_INSTALL_BIN_SUBDIR})
+    SET(THC_INSTALL_LIB_SUBDIR ${Torch_INSTALL_LIB_SUBDIR})
+    SET(THC_INSTALL_INCLUDE_SUBDIR ${Torch_INSTALL_INCLUDE_SUBDIR})
+    SET(THC_INSTALL_CMAKE_SUBDIR ${Torch_INSTALL_CMAKE_SUBDIR})
+  ELSE(Torch_INSTALL_BIN_SUBDIR)
+    # not installing in a Torch context, so Torch_INSTALL_BIN_SUBDIR is not available
+    SET(THC_INSTALL_BIN_SUBDIR "bin" CACHE PATH "THC install binary subdirectory")           
+    SET(THC_INSTALL_LIB_SUBDIR "lib" CACHE PATH "THC install library subdirectory")                     
+    SET(THC_INSTALL_INCLUDE_SUBDIR "include" CACHE PATH "THC install include subdirectory")                     
+    SET(THC_INSTALL_CMAKE_SUBDIR "share/cmake/THC" CACHE PATH "THC install cmake subdirectory")
+  ENDIF(Torch_INSTALL_BIN_SUBDIR)
+
 ENDIF()
 
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}")