Added status output

apache · Jul 20, 2018 · d84854c · d84854c
1 parent c48154b
commit d84854c
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.build.android_armv7
@@ -71,7 +71,6 @@ COPY install/android_armv7_openblas.sh /work/deps
 RUN /work/deps/android_armv7_openblas.sh
 
 ENV OpenBLAS_HOME=${CROSS_ROOT}
-ENV OpenBLAS_DIR=${CROSS_ROOT}
 
 WORKDIR /work
 

diff --git a/ci/docker/Dockerfile.build.android_armv8 b/ci/docker/Dockerfile.build.android_armv8
@@ -73,7 +73,9 @@ ENV CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++
 # Build ARM dependencies.
 COPY install/android_arm64_openblas.sh /work/
 RUN /work/android_arm64_openblas.sh
-ENV CPLUS_INCLUDE_PATH /work/deps/OpenBLAS
+
+ENV OpenBLAS_HOME=${CROSS_ROOT}
+
 WORKDIR /work/build
 
 COPY runtime_functions.sh /work/
diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.build.armv6
@@ -33,7 +33,6 @@ COPY install/arm_openblas.sh /work/
 RUN /work/arm_openblas.sh
 
 ENV OpenBLAS_HOME=${CROSS_ROOT}
-ENV OpenBLAS_DIR=${CROSS_ROOT}
 
 COPY install/deb_ubuntu_ccache.sh /work/
 RUN /work/deb_ubuntu_ccache.sh

diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7
@@ -33,7 +33,6 @@ COPY install/arm_openblas.sh /work/
 RUN /work/arm_openblas.sh
 
 ENV OpenBLAS_HOME=${CROSS_ROOT}
-ENV OpenBLAS_DIR=${CROSS_ROOT}
 
 COPY install/deb_ubuntu_ccache.sh /work/
 RUN /work/deb_ubuntu_ccache.sh

diff --git a/ci/docker/Dockerfile.build.armv8 b/ci/docker/Dockerfile.build.armv8
@@ -39,7 +39,6 @@ COPY install/arm_openblas.sh /work/
 RUN /work/arm_openblas.sh
 
 ENV OpenBLAS_HOME=${CROSS_ROOT}
-ENV OpenBLAS_DIR=${CROSS_ROOT}
 
 COPY install/deb_ubuntu_ccache.sh /work/
 RUN /work/deb_ubuntu_ccache.sh

diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson
@@ -45,7 +45,6 @@ COPY install/arm_openblas.sh /work/
 RUN /work/arm_openblas.sh
 
 ENV OpenBLAS_HOME=${CROSS_ROOT}
-ENV OpenBLAS_DIR=${CROSS_ROOT}
 
 COPY install/deb_ubuntu_ccache.sh /work/
 RUN /work/deb_ubuntu_ccache.sh

diff --git a/cmake/Modules/FindAccelerate.cmake b/cmake/Modules/FindAccelerate.cmake
@@ -25,6 +25,7 @@
 
 if($ENV{Accelerate_HOME})
   file(TO_CMAKE_PATH "$ENV{Accelerate_HOME}" Accelerate_HOME)
+  message(STATUS "Accelerate_HOME=${Accelerate_HOME}")
 endif()
 
 set(Accelerate_INCLUDE_SEARCH_PATHS

diff --git a/cmake/Modules/FindAtlas.cmake b/cmake/Modules/FindAtlas.cmake
@@ -30,11 +30,13 @@
 # Atlas_LIBRARIES
 
 if($ENV{Atlas_ROOT_DIR})
-  file(TO_CMAKE_PATH "$ENV{Atlas_ROOT_DIR}" CROSS_ROOT)
+  file(TO_CMAKE_PATH "$ENV{Atlas_ROOT_DIR}" Atlas_ROOT_DIR)
+  message(STATUS "Atlas_ROOT_DIR=${Atlas_ROOT_DIR}")
 endif()
 
 if($ENV{CROSS_ROOT})
   file(TO_CMAKE_PATH "$ENV{CROSS_ROOT}" CROSS_ROOT)
+  message(STATUS "CROSS_ROOT=${CROSS_ROOT}")
 endif()
 
 if(CMAKE_CROSSCOMPILING)

diff --git a/cmake/Modules/FindMKL.cmake b/cmake/Modules/FindMKL.cmake
@@ -34,6 +34,7 @@
 
 if($ENV{MKLROOT})
   file(TO_CMAKE_PATH "$ENV{MKLROOT}" MKLROOT)
+  message(STATUS "MKLROOT=${MKLROOT}")
 endif()
 
 # ---[ Root folders

diff --git a/cmake/Modules/FindMKLML.cmake b/cmake/Modules/FindMKLML.cmake
@@ -29,6 +29,7 @@
 
 if($ENV{MKLROOT})
   file(TO_CMAKE_PATH "$ENV{MKLROOT}" MKLROOT)
+  message(STATUS "MKLROOT=${MKLROOT}")
 endif()
 
 set(MKLML_INCLUDE_SEARCH_PATHS

diff --git a/cmake/Modules/FindOpenBLAS.cmake b/cmake/Modules/FindOpenBLAS.cmake
@@ -31,14 +31,12 @@
 
 if($ENV{OpenBLAS_HOME})
   file(TO_CMAKE_PATH "$ENV{OpenBLAS_HOME}" OpenBLAS_HOME)
-endif()
-
-if($ENV{OpenBLAS})
-  file(TO_CMAKE_PATH "$ENV{OpenBLAS}" OpenBLAS_DIR)
+  message(STATUS "OpenBLAS_HOME=${OpenBLAS_HOME}")
 endif()
 
 if($ENV{CROSS_ROOT})
   file(TO_CMAKE_PATH "$ENV{CROSS_ROOT}" CROSS_ROOT)
+  message(STATUS "CROSS_ROOT=${CROSS_ROOT}")
 endif()
 
 if(CMAKE_CROSSCOMPILING)