Merge pull request #7967 from cloudhan/win_build_chainerx

Fix Windows build of ChainerX
chainer · Aug 19, 2019 · 2e3ed4a · 2e3ed4a
2 parents 41a0724 + e0e7856
commit 2e3ed4a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/chainerx_cc/chainerx/native/CMakeLists.txt b/chainerx_cc/chainerx/native/CMakeLists.txt
@@ -40,7 +40,7 @@ add_library(chainerx_native STATIC
 if(${BLAS_FOUND})
     if(DEFINED ENV{CHAINERX_BLAS_INCLUDE_DIRS})
         set(BLAS_INCLUDE_DIRS $ENV{CHAINERX_BLAS_INCLUDE_DIRS})
-    else()
+    elseif(UNIX)
         # Workaround for UNIX environments to guess the BLAS include directory from its library path (.so).
         # This workaround is required since CMake does not set the BLAS_INCLUDE_DIRS variable.
         list(GET BLAS_LIBRARIES 0 BLAS_LIBRARY)

diff --git a/chainerx_cc/third_party/abseil.cmake b/chainerx_cc/third_party/abseil.cmake
@@ -13,4 +13,7 @@ ExternalProject_Add(pybind11
     BUILD_COMMAND     ""
     INSTALL_COMMAND   ""
     TEST_COMMAND      ""
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_MESSAGE=LAZY
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     )
diff --git a/chainerx_cc/third_party/gsl-lite.cmake b/chainerx_cc/third_party/gsl-lite.cmake
@@ -11,4 +11,7 @@ ExternalProject_Add(gsl-lite
         BUILD_COMMAND     ""
         INSTALL_COMMAND   ""
         TEST_COMMAND      ""
-        )
+        CMAKE_ARGS
+                -DCMAKE_INSTALL_MESSAGE=LAZY
+                -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+)
diff --git a/chainerx_cc/third_party/gtest.cmake b/chainerx_cc/third_party/gtest.cmake
@@ -12,4 +12,7 @@ ExternalProject_Add(googletest
     BUILD_COMMAND     ""
     INSTALL_COMMAND   ""
     TEST_COMMAND      ""
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_MESSAGE=LAZY
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     )
diff --git a/chainerx_cc/third_party/pybind11.cmake b/chainerx_cc/third_party/pybind11.cmake
@@ -11,4 +11,7 @@ ExternalProject_Add(pybind11
     BUILD_COMMAND     ""
     INSTALL_COMMAND   ""
     TEST_COMMAND      ""
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_MESSAGE=LAZY
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     )