From 4ebfbbcaf5f526de8edea52cda0b0b3fc5a0986f Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Mon, 16 Oct 2017 13:43:18 +0200
Subject: [PATCH] BUG: Mantis-1456: fix for SuperBuild using Visual generator
---
SuperBuild/CMake/External_zlib.cmake | 2 +-
SuperBuild/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/SuperBuild/CMake/External_zlib.cmake b/SuperBuild/CMake/External_zlib.cmake
index 6948e1f542..4d68aae34c 100644
--- a/SuperBuild/CMake/External_zlib.cmake
+++ b/SuperBuild/CMake/External_zlib.cmake
@@ -49,7 +49,7 @@ endif()
#check who uses zdll.lib and remove this hack
if(MSVC)
ExternalProject_Add_Step(ZLIB msvc_copy_hell
- COMMAND ${CMAKE_COMMAND} -E copy ${ZLIB_SB_BUILD_DIR}/zlib.lib ${SB_INSTALL_PREFIX}/lib/zdll.lib
+ COMMAND ${CMAKE_COMMAND} -E copy ${SB_INSTALL_PREFIX}/lib/zlib.lib ${SB_INSTALL_PREFIX}/lib/zdll.lib
DEPENDEES install)
endif()
diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index cf670ba43e..affdfdb141 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -227,7 +227,7 @@ if(UNIX)
message(STATUS "Environment setup for Configure (SB_ENV_CONFIGURE_CMD): ${SB_ENV_CONFIGURE_CMD}")
else()
#windows
- set(SB_CMAKE_COMMAND ${CMAKE_COMMAND} ${SB_CMAKE_ARGS})
+ set(SB_CMAKE_COMMAND ${CMAKE_COMMAND})
endif()
if(CMAKE_C_FLAGS)
--
GitLab