fix config problem " -> \" for windows nvcc

ginkgo-project · Mar 17, 2020 · e22bc02 · e22bc02
1 parent 97f05fd
commit e22bc02
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -230,6 +230,10 @@ endif()
 configure_file(${Ginkgo_SOURCE_DIR}/cmake/ginkgo.pc.in
  ${Ginkgo_BINARY_DIR}/ginkgo.pc @ONLY)
 
+# WINDOWS NVCC has " inside the string, add escape charater to avoid config problem.
+ginkgo_modify_flags(CMAKE_CUDA_FLAGS)
+ginkgo_modify_flags(CMAKE_CUDA_FLAGS_DEBUG)
+ginkgo_modify_flags(CMAKE_CUDA_FLAGS_RELEASE)
 ginkgo_install()
 
 if (MSVC)

diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in
@@ -116,9 +116,9 @@ set(GINKGO_CUSPARSE_LIBRARIES @CUSPARSE@)
 set(GINKGO_CUDA_LIBRARIES @CUDA_RUNTIME_LIBS@)
 set(GINKGO_CUDA_TOOLKIT_INCLUDE_DIRECTORIES "@CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES@")
 
-set(GINKGO_CUDA_FLAGS "@CMAKE_CUDA_FLAGS@")
-set(GINKGO_CUDA_FLAGS_DEBUG "@CMAKE_CUDA_FLAGS_DEBUG@")
-set(GINKGO_CUDA_FLAGS_RELEASE "@CMAKE_CUDA_FLAGS_RELEASE@")
+set(GINKGO_CUDA_FLAGS "@CMAKE_CUDA_FLAGS_MODIFY@")
+set(GINKGO_CUDA_FLAGS_DEBUG "@CMAKE_CUDA_FLAGS_DEBUG_MODIFY@")
+set(GINKGO_CUDA_FLAGS_RELEASE "@CMAKE_CUDA_FLAGS_RELEASE_MODIFY@")
 
 # OpenMP
 set(GINKGO_OPENMP_VERSION @OpenMP_CXX_VERSION@)

diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
@@ -78,3 +78,10 @@ function(ginkgo_check_shared_library name)
  "Please add ${GINKGO_WINDOWS_SHARED_LIBRARY_PATH} into the environment variable PATH.")
  endif()
 endfunction()
+
+macro(ginkgo_modify_flags name)
+ # add escape before "
+ # the result var is ${name}_MODIFY
+ string(REPLACE "\"" "\\\"" ${name}_MODIFY "${${name}}")
+ message("MODIFY ${${name}} ${${name}_MODIFY}")
+endmacro()