[Getfem-commits] (no subject)

getfem-commits
[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, 14 May 2019 05:26:42 -0400 (EDT)
branch: c14_complience
commit 7b85d5cebd98407b24de6f42cddb5ebfa658e60a
Author: Andriy.Andreykiv <address@hidden>
Date:   Tue May 14 11:26:17 2019 +0200

    updating MSVC solution to Visual Studio 2017. Fixing run-time options, 
updating file lists
---
 msvc/bilaplacian/bilaplacian.vcxproj                               | 2 +-
 msvc/common_debug_settings.props                                   | 1 +
 msvc/common_release_settings.props                                 | 5 +++--
 msvc/elastostatic/elastostatic.vcxproj                             | 2 +-
 msvc/libgetfem/libgetfem.vcxproj                                   | 7 +++----
 msvc/libgetfemint/libgetfemint.vcxproj                             | 2 +-
 msvc/matlab_interface/matlab_interface.vcxproj                     | 2 +-
 msvc/poly/poly.vcxproj                                             | 3 +--
 msvc/superlu/superlu.vcxproj                                       | 3 +--
 msvc/test_assembly/test_assembly.vcxproj                           | 2 +-
 msvc/test_kdtree/test_kdtree.vcxproj                               | 3 +--
 msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.vcxproj | 5 +++--
 msvc/test_level_set_contact/test_level_set_contact.vcxproj         | 3 +--
 13 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/msvc/bilaplacian/bilaplacian.vcxproj 
b/msvc/bilaplacian/bilaplacian.vcxproj
index 4175408..db653bd 100755
--- a/msvc/bilaplacian/bilaplacian.vcxproj
+++ b/msvc/bilaplacian/bilaplacian.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
diff --git a/msvc/common_debug_settings.props b/msvc/common_debug_settings.props
index 345d91f..37f876f 100644
--- a/msvc/common_debug_settings.props
+++ b/msvc/common_debug_settings.props
@@ -17,6 +17,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       
<DisableSpecificWarnings>4190;4355;4503;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/common_release_settings.props 
b/msvc/common_release_settings.props
index 9f930ed..834f274 100644
--- a/msvc/common_release_settings.props
+++ b/msvc/common_release_settings.props
@@ -7,11 +7,11 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Full</Optimization>
+      <Optimization>MaxSpeed</Optimization>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       
<AdditionalIncludeDirectories>..;..\..\src;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;_SECURE_SCL=0;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <WarningLevel>Level3</WarningLevel>
@@ -19,6 +19,7 @@
       
<DisableSpecificWarnings>4190;4355;4503;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/elastostatic/elastostatic.vcxproj 
b/msvc/elastostatic/elastostatic.vcxproj
index dce857c..56dc690 100755
--- a/msvc/elastostatic/elastostatic.vcxproj
+++ b/msvc/elastostatic/elastostatic.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
diff --git a/msvc/libgetfem/libgetfem.vcxproj b/msvc/libgetfem/libgetfem.vcxproj
index 57457f0..95d87ee 100755
--- a/msvc/libgetfem/libgetfem.vcxproj
+++ b/msvc/libgetfem/libgetfem.vcxproj
@@ -22,13 +22,13 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <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">
@@ -51,7 +51,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      
<PreprocessorDefinitions>_DEBUG;_LIB;WIN32;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>GETFEM_HAS_OPENMP;_DEBUG;_LIB;WIN32;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -68,7 +68,6 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       
<PreprocessorDefinitions>_LIB;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/msvc/libgetfemint/libgetfemint.vcxproj 
b/msvc/libgetfemint/libgetfemint.vcxproj
index e1564aa..4d3206d 100755
--- a/msvc/libgetfemint/libgetfemint.vcxproj
+++ b/msvc/libgetfemint/libgetfemint.vcxproj
@@ -130,7 +130,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
diff --git a/msvc/matlab_interface/matlab_interface.vcxproj 
b/msvc/matlab_interface/matlab_interface.vcxproj
index b009e1c..7cfd382 100755
--- a/msvc/matlab_interface/matlab_interface.vcxproj
+++ b/msvc/matlab_interface/matlab_interface.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
diff --git a/msvc/poly/poly.vcxproj b/msvc/poly/poly.vcxproj
index f09b62d..4f068c9 100755
--- a/msvc/poly/poly.vcxproj
+++ b/msvc/poly/poly.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -73,7 +73,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/msvc/superlu/superlu.vcxproj b/msvc/superlu/superlu.vcxproj
index c59792e..4172b2e 100755
--- a/msvc/superlu/superlu.vcxproj
+++ b/msvc/superlu/superlu.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -71,7 +71,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       
<PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
diff --git a/msvc/test_assembly/test_assembly.vcxproj 
b/msvc/test_assembly/test_assembly.vcxproj
index 7e93964..ac41907 100755
--- a/msvc/test_assembly/test_assembly.vcxproj
+++ b/msvc/test_assembly/test_assembly.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
diff --git a/msvc/test_kdtree/test_kdtree.vcxproj 
b/msvc/test_kdtree/test_kdtree.vcxproj
index 78924dd..3485af0 100755
--- a/msvc/test_kdtree/test_kdtree.vcxproj
+++ b/msvc/test_kdtree/test_kdtree.vcxproj
@@ -22,7 +22,7 @@
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -71,7 +71,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       
<PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
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 851f1c6..aa26dcb 100644
--- a/msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.vcxproj
+++ b/msvc/test_laplacian_with_bricks/test_laplacian_with_bricks.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>
@@ -29,7 +29,7 @@
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -54,6 +54,7 @@
       <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>
     </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 11f89df..82e587f 100644
--- a/msvc/test_level_set_contact/test_level_set_contact.vcxproj
+++ b/msvc/test_level_set_contact/test_level_set_contact.vcxproj
@@ -29,7 +29,7 @@
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <UseIntelMKL>Sequential</UseIntelMKL>
+    <UseIntelMKL>No</UseIntelMKL>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -67,7 +67,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </ClCompile>
     <Link>
[Prev in Thread]
Current Thread
[Next in Thread]
[Getfem-commits] [getfem-commits] branch c14_complience created (now 7b85d5c), Andriy Andreykiv, 2019/05/14
- [Getfem-commits] (no subject), Andriy Andreykiv, 2019/05/14
- [Getfem-commits] (no subject), Andriy Andreykiv, 2019/05/14
- [Getfem-commits] (no subject), Andriy Andreykiv, 2019/05/14
- [Getfem-commits] (no subject), Andriy Andreykiv, 2019/05/14
- [Getfem-commits] (no subject), Andriy Andreykiv, 2019/05/14
- [Getfem-commits] (no subject), Andriy Andreykiv <=
Prev by Date: [Getfem-commits] (no subject)
Next by Date: [Getfem-commits] merge request: c14_complience
Previous by thread: [Getfem-commits] (no subject)
Next by thread: [Getfem-commits] merge request: c14_complience
Index(es):
- Date
- Thread