[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Andriy Andreykiv |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Tue, 2 Jul 2019 08:33:29 -0400 (EDT) |
branch: msvc_solution_update
commit 4f45a6433e95b43f241f141ddcbc9d43bb1d5649
Author: Andriy.Andreykiv <address@hidden>
Date: Tue Jul 2 14:33:13 2019 +0200
updating all MSVC projects
---
msvc/bilaplacian/bilaplacian.vcxproj | 4 +---
msvc/elastostatic/elastostatic.vcxproj | 4 +---
msvc/libgetfem/libgetfem.vcxproj | 3 +--
msvc/libgetfemint/libgetfemint.vcxproj | 4 +---
msvc/matlab_interface/matlab_interface.vcxproj | 4 +---
msvc/poly/poly.vcxproj | 3 +--
msvc/superlu/superlu.vcxproj | 3 +--
msvc/test_assembly/test_assembly.vcxproj | 4 +---
msvc/test_kdtree/test_kdtree.vcxproj | 3 +--
msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.vcxproj | 3 +--
msvc/test_level_set_contact/test_level_set_contact.vcxproj | 3 +--
11 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/msvc/bilaplacian/bilaplacian.vcxproj
b/msvc/bilaplacian/bilaplacian.vcxproj
index db653bd..9246ef4 100755
--- a/msvc/bilaplacian/bilaplacian.vcxproj
+++ b/msvc/bilaplacian/bilaplacian.vcxproj
@@ -28,7 +28,7 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -58,7 +58,6 @@
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -71,7 +70,6 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/msvc/elastostatic/elastostatic.vcxproj
b/msvc/elastostatic/elastostatic.vcxproj
index 56dc690..cf7469b 100755
--- a/msvc/elastostatic/elastostatic.vcxproj
+++ b/msvc/elastostatic/elastostatic.vcxproj
@@ -28,7 +28,7 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -59,7 +59,6 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -71,7 +70,6 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/msvc/libgetfem/libgetfem.vcxproj b/msvc/libgetfem/libgetfem.vcxproj
index 95d87ee..c95eddb 100755
--- a/msvc/libgetfem/libgetfem.vcxproj
+++ b/msvc/libgetfem/libgetfem.vcxproj
@@ -51,13 +51,12 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
-
<PreprocessorDefinitions>GETFEM_HAS_OPENMP;_DEBUG;_LIB;WIN32;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions>
+
<PreprocessorDefinitions>_DEBUG;_LIB;WIN32;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Lib />
diff --git a/msvc/libgetfemint/libgetfemint.vcxproj
b/msvc/libgetfemint/libgetfemint.vcxproj
index 4d3206d..22cd643 100755
--- a/msvc/libgetfemint/libgetfemint.vcxproj
+++ b/msvc/libgetfemint/libgetfemint.vcxproj
@@ -136,7 +136,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -167,7 +167,6 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -175,7 +174,6 @@
<AdditionalIncludeDirectories>..\qhull-2011.1\src;..\muparser_v134\include;..\..\interface\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;WIN32;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/msvc/matlab_interface/matlab_interface.vcxproj
b/msvc/matlab_interface/matlab_interface.vcxproj
index 7cfd382..58b0606 100755
--- a/msvc/matlab_interface/matlab_interface.vcxproj
+++ b/msvc/matlab_interface/matlab_interface.vcxproj
@@ -28,7 +28,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -62,7 +62,6 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalOptions>/export:mexFunction
/LIBPATH:"P:\PROGRA~2\MATLAB\R2010b\extern\lib\win32\microsoft" libmx.lib
libmex.lib libmat.lib %(AdditionalOptions)</AdditionalOptions>
@@ -78,7 +77,6 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>P:\Program Files
(x86)\MATLAB\R2010b\extern\include;$(SolutionDir)/../interface/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_LIB;MATLAB_RELEASE=14;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/msvc/poly/poly.vcxproj b/msvc/poly/poly.vcxproj
index 4f068c9..0da3fb6 100755
--- a/msvc/poly/poly.vcxproj
+++ b/msvc/poly/poly.vcxproj
@@ -28,7 +28,7 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -60,7 +60,6 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/msvc/superlu/superlu.vcxproj b/msvc/superlu/superlu.vcxproj
index 4172b2e..33189fe 100755
--- a/msvc/superlu/superlu.vcxproj
+++ b/msvc/superlu/superlu.vcxproj
@@ -28,7 +28,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -62,7 +62,6 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/msvc/test_assembly/test_assembly.vcxproj
b/msvc/test_assembly/test_assembly.vcxproj
index ac41907..1aa90c5 100755
--- a/msvc/test_assembly/test_assembly.vcxproj
+++ b/msvc/test_assembly/test_assembly.vcxproj
@@ -28,7 +28,7 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -59,7 +59,6 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -71,7 +70,6 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/msvc/test_kdtree/test_kdtree.vcxproj
b/msvc/test_kdtree/test_kdtree.vcxproj
index 3485af0..347ab90 100755
--- a/msvc/test_kdtree/test_kdtree.vcxproj
+++ b/msvc/test_kdtree/test_kdtree.vcxproj
@@ -28,7 +28,7 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -58,7 +58,6 @@
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.vcxproj
b/msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.vcxproj
index aa26dcb..d11fe6b 100644
--- a/msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.vcxproj
+++ b/msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.vcxproj
@@ -52,9 +52,8 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-
<PreprocessorDefinitions>GETFEM_HAS_OPENMP;WIN32;_SECURE_SCL=0;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>WIN32;_SECURE_SCL=0;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/msvc/test_level_set_contact/test_level_set_contact.vcxproj
b/msvc/test_level_set_contact/test_level_set_contact.vcxproj
index 82e587f..4841e5d 100644
--- a/msvc/test_level_set_contact/test_level_set_contact.vcxproj
+++ b/msvc/test_level_set_contact/test_level_set_contact.vcxproj
@@ -21,7 +21,7 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
- <UseIntelMKL>Sequential</UseIntelMKL>
+ <UseIntelMKL>No</UseIntelMKL>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -54,7 +54,6 @@
<PreprocessorDefinitions>GETFEM_HAVE_MUPARSER_H;GETFEM_HAVE_QHULL_QHULL_H;_DEBUG;_LIB;WIN32;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>