[ReadOsm][FreeXL] fix spacebar-in-path problems

microsoft · Oct 3, 2017 · 4ad9ae8 · 4ad9ae8
1 parent e25a31e
commit 4ad9ae8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake
@@ -16,12 +16,12 @@ vcpkg_apply_patches(
 find_program(NMAKE nmake)
 
 set(LIBS_ALL_DBG 
-	"${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \
-	${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib"
+	"\"${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib\" \
+	\"${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib\""
    )
 set(LIBS_ALL_REL 
-	"${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \
-	${CURRENT_INSTALLED_DIR}/lib/libcharset.lib"
+	"\"${CURRENT_INSTALLED_DIR}/lib/libiconv.lib\" \
+	\"${CURRENT_INSTALLED_DIR}/lib/libcharset.lib\""
    )
 
 
@@ -42,7 +42,7 @@ message(STATUS "Building ${TARGET_TRIPLET}-dbg")
 file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG)
 vcpkg_execute_required_process(
     COMMAND ${NMAKE} -f makefile.vc clean install
-    INST_DIR=${INST_DIR_DBG} INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
+    INST_DIR="${INST_DIR_DBG}" INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
     WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME nmake-build-${TARGET_TRIPLET}-debug
 )
@@ -57,7 +57,7 @@ message(STATUS "Building ${TARGET_TRIPLET}-rel")
 file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
 vcpkg_execute_required_process(
     COMMAND ${NMAKE} -f makefile.vc clean install
-    INST_DIR=${INST_DIR_REL} INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
+    INST_DIR="${INST_DIR_REL}" INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
     WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME nmake-build-${TARGET_TRIPLET}-release
 )

diff --git a/ports/readosm/portfile.cmake b/ports/readosm/portfile.cmake
@@ -16,8 +16,8 @@ vcpkg_apply_patches(
 
 find_program(NMAKE nmake)
 
-set(LIBS_ALL_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib")
-set(LIBS_ALL_REL "${CURRENT_INSTALLED_DIR}/lib/expat.lib ${CURRENT_INSTALLED_DIR}/lib/zlib.lib")
+set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"")
+set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/expat.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"")
 
 if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
 	set(CL_FLAGS_DBG "/MDd /Zi")
@@ -36,7 +36,7 @@ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG)
 
 vcpkg_execute_required_process(
     COMMAND ${NMAKE} -f makefile.vc clean install
-    INST_DIR=${INST_DIR_DBG} INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}"
+    INST_DIR="${INST_DIR_DBG}" INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" "LINK_FLAGS=/debug" "CL_FLAGS=${CL_FLAGS_DBG}"
     "LIBS_ALL=${LIBS_ALL_DBG}"
     WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME nmake-build-${TARGET_TRIPLET}-debug
@@ -52,7 +52,7 @@ message(STATUS "Building ${TARGET_TRIPLET}-rel")
 file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
 vcpkg_execute_required_process(
     COMMAND ${NMAKE} -f makefile.vc clean install
-    INST_DIR=${INST_DIR_REL} INSTALLED_ROOT=${CURRENT_INSTALLED_DIR} "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}"
+    INST_DIR="${INST_DIR_REL}" INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" "LINK_FLAGS=" "CL_FLAGS=${CL_FLAGS_REL}"
     "LIBS_ALL=${LIBS_ALL_REL}"
     WORKING_DIRECTORY ${SOURCE_PATH}
     LOGNAME nmake-build-${TARGET_TRIPLET}-release