Merge pull request #51 from Microsoft/bvlc_win_to_ms_master_2016_03_21

Merge bvlc/windows@{2016-03-21} into master
microsoft · Mar 21, 2016 · 5c55969 · 5c55969
2 parents 9837af6 + 65b48ec
commit 5c55969
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/windows/caffe/caffe.vcxproj b/windows/caffe/caffe.vcxproj
@@ -45,7 +45,7 @@
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
-      <Command>$(ScriptsDir)\FixGFlagsNaming.cmd "$(OutDir)" $(Configuration)</Command>
+      <Command>"$(ScriptsDir)\FixGFlagsNaming.cmd" "$(OutDir)" $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -54,7 +54,7 @@
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
-      <Command>$(ScriptsDir)\FixGFlagsNaming.cmd "$(OutDir)" $(Configuration)</Command>
+      <Command>"$(ScriptsDir)\FixGFlagsNaming.cmd" "$(OutDir)" $(Configuration)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/windows/scripts/BinplaceCudaDependencies.cmd b/windows/scripts/BinplaceCudaDependencies.cmd
@@ -16,7 +16,7 @@ if %IS_CPU_ONLY_BUILD% == true (
     if %USE_CUDNN% == true (
         echo BinplaceCudaDependencies : Copy cudnn*.dll to output.
 
-        if [%CUDNN_PATH%] == [] (
+        if "%CUDNN_PATH%" == "" (
             copy /y "%CUDA_TOOLKIT_BIN_DIR%\cudnn*.dll" "%OUTPUT_DIR%"
         ) else (
             copy /y "%CUDNN_PATH%\cuda\bin\cudnn*.dll" "%OUTPUT_DIR%"