Merge fix windows compilation

This PR fixes the windows compilation Related PR: #415
ginkgo-project · Dec 9, 2019 · 9a62eb3 · 9a62eb3
2 parents b4262c9 + 16420cd
commit 9a62eb3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -150,6 +150,12 @@ endif()
 configure_file(${Ginkgo_SOURCE_DIR}/include/ginkgo/config.hpp.in
     ${Ginkgo_BINARY_DIR}/include/ginkgo/config.hpp @ONLY)
 
+# Load CMake helpers
+include(cmake/build_helpers.cmake)
+include(cmake/build_type_helpers.cmake)
+include(cmake/hip_helpers.cmake)
+include(cmake/install_helpers.cmake)
+
 # This is modified from https://gitlab.kitware.com/cmake/community/wikis/FAQ#dynamic-replace
 if(MSVC)
     if(BUILD_SHARED_LIBS)
@@ -163,12 +169,6 @@ if(MSVC)
     endif()
 endif()
 
-# Load CMake helpers
-include(cmake/build_helpers.cmake)
-include(cmake/build_type_helpers.cmake)
-include(cmake/hip_helpers.cmake)
-include(cmake/install_helpers.cmake)
-
 # Try to find the third party packages before using our subdirectories
 include(cmake/package_helpers.cmake)
 ginkgo_find_package(GTest "GTest::GTest;GTest::Main" FALSE 1.8.1)

diff --git a/include/ginkgo/core/base/executor.hpp b/include/ginkgo/core/base/executor.hpp
@@ -1005,7 +1005,7 @@ using DefaultExecutor = CudaExecutor;
  */
 class HipExecutor : public detail::ExecutorBase<HipExecutor>,
                     public std::enable_shared_from_this<HipExecutor> {
-    friend class ExecutorBase<HipExecutor>;
+    friend class detail::ExecutorBase<HipExecutor>;
 
 public:
     /**