]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
ROOT [Windows]
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 18 May 2021 16:52:23 +0000 (18:52 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 18 May 2021 16:52:23 +0000 (18:52 +0200)
products/compil_scripts/root-6.24.bat
products/patches/python-3.6.5-VS2019.patch [new file with mode: 0644]

index 5d75e9e7cc39e750a5a71ea0670fe015464bcf7c..0e89f39f36830e3631749d5dc7f47b8788bf4f92 100644 (file)
@@ -52,6 +52,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SYSTEM_VERSION=10.0.19041.0
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
+set PATH=%BUILD_DIR%\bin;%PATH%
 
 echo.
 echo --------------------------------------------------------------------------
diff --git a/products/patches/python-3.6.5-VS2019.patch b/products/patches/python-3.6.5-VS2019.patch
new file mode 100644 (file)
index 0000000..2a6ed17
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Naur Python_ref/PCbuild/_distutils_findvs.vcxproj Python_new/PCbuild/_distutils_findvs.vcxproj
+--- Python_ref/PCbuild/_distutils_findvs.vcxproj       2018-03-28 11:19:31.000000000 +0200
++++ Python_new/PCbuild/_distutils_findvs.vcxproj       2021-05-18 18:47:18.610913526 +0200
+@@ -61,7 +61,7 @@
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+     <Link>
+-      <AdditionalDependencies>version.lib;ole32.lib;oleaut32.lib;Microsoft.VisualStudio.Setup.Configuration.Native.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>version.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(PySourcePath)PC\external\$(PlatformToolset)\$(ArchName)</AdditionalLibraryDirectories>
+     </Link>
+   </ItemDefinitionGroup>