This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new e9b4270 GEODE-5638: Organize/Cleanup the geode-native project
structure (#369)
e9b4270 is described below
commit e9b4270249a5abd8ccb4887943cf51d7d0f055e1
Author: Ernie Burghardt <[email protected]>
AuthorDate: Fri Oct 5 11:10:47 2018 -0600
GEODE-5638: Organize/Cleanup the geode-native project structure (#369)
* Use CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION for cmake generated projects.
* Removed dead code and hard coded path to project.
* Remove GUIDs from project references.
* Removing white space
---
CMakeLists.txt | 2 +-
clicache/integration-test2/CMakeLists.txt | 1 -
clicache/plugins/SQLiteCLI/CMakeLists.txt | 1 -
clicache/src/CMakeLists.txt | 1 -
clicache/test/CMakeLists.txt | 1 -
clicache/test2/CMakeLists.txt | 1 -
tests/cli/CMakeLists.txt | 1 -
tests/cli/NewFwkLib/NewFwkLib.csproj.in | 2 +-
tests/cli/PdxClassLibrary/CMakeLists.txt | 1 -
tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in | 2 +-
tests/cli/PkcsWrapper/CMakeLists.txt | 1 -
tests/cli/QueryHelper/CMakeLists.txt | 1 -
12 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6afe85c..e1e1d71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,8 +35,8 @@ if(CMAKE_GENERATOR MATCHES Win64*)
endif()
endif()
+set(CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION "4.5.2")
set(DOTNET_TARGET_FRAMEWORK_VERSION "4.5.2")
-
set(BUILD_BITS 64 CACHE STRING "Build for 64 (Geode default) or 32 bit.")
set(PRODUCT_VENDOR "Apache" CACHE STRING "Product vendor")
diff --git a/clicache/integration-test2/CMakeLists.txt
b/clicache/integration-test2/CMakeLists.txt
index d7d177e..990dd86 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/integration-test2/CMakeLists.txt
@@ -64,7 +64,6 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_GLOBAL_TreatWarningsAsErrors True
VS_GLOBAL_TestProjectType UnitTest
VS_GLOBAL_PROJECT_TYPES
"{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCES "System;System.Xml;System.Web;System.Configuration"
VS_DOTNET_REFERENCE_Microsoft.VisualStudio.TestPlatform.TestFramework
"${CMAKE_BINARY_DIR}/clicache/packages/Microsoft.VisualStudio.TestPlatform.14.0.0.1/lib/net20/Microsoft.VisualStudio.TestPlatform.TestFramework.dll"
VS_DOTNET_REFERENCE_Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions
"${CMAKE_BINARY_DIR}/clicache/packages/Microsoft.VisualStudio.TestPlatform.14.0.0.1/lib/net20/Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll"
diff --git a/clicache/plugins/SQLiteCLI/CMakeLists.txt
b/clicache/plugins/SQLiteCLI/CMakeLists.txt
index fa07224..f6440eb 100644
--- a/clicache/plugins/SQLiteCLI/CMakeLists.txt
+++ b/clicache/plugins/SQLiteCLI/CMakeLists.txt
@@ -32,7 +32,6 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
VS_GLOBAL_TreatWarningsAsErrors True
VS_GLOBAL_PROJECT_TYPES "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCE_System.Data.SQLite ${sqlite-netFx_SHARED_LIB}
VS_DOTNET_REFERENCES "System;System.Data;System.Xml"
FOLDER cli/plugins
diff --git a/clicache/src/CMakeLists.txt b/clicache/src/CMakeLists.txt
index 1bd3726..cda87a9 100644
--- a/clicache/src/CMakeLists.txt
+++ b/clicache/src/CMakeLists.txt
@@ -309,7 +309,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
VS_GLOBAL_KEYWORD "ManagedCProj"
VS_GLOBAL_PROJECT_TYPES "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCES "System;System.Xml;System.Core"
FOLDER cli
)
diff --git a/clicache/test/CMakeLists.txt b/clicache/test/CMakeLists.txt
index b477546..acb0229 100644
--- a/clicache/test/CMakeLists.txt
+++ b/clicache/test/CMakeLists.txt
@@ -39,7 +39,6 @@ set_target_properties(Apache.Geode.Test PROPERTIES
VS_GLOBAL_TestProjectType UnitTest
VS_GLOBAL_PROJECT_TYPES
"{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
VS_GLOBAL_ROOTNAMESPACE Apache.Geode.Test
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCES
"System;System.Xml;Microsoft.VisualStudio.QualityTools.UnitTestFramework"
FOLDER cli/test/unit
)
diff --git a/clicache/test2/CMakeLists.txt b/clicache/test2/CMakeLists.txt
index 0fffc3e..cd022c6 100644
--- a/clicache/test2/CMakeLists.txt
+++ b/clicache/test2/CMakeLists.txt
@@ -42,7 +42,6 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES
VS_GLOBAL_TreatWarningsAsErrors True
VS_GLOBAL_TestProjectType UnitTest
VS_GLOBAL_PROJECT_TYPES
"{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCES "System;System.Xml;System.Web;System.Configuration"
VS_DOTNET_REFERENCE_Microsoft.VisualStudio.TestPlatform.TestFramework
"${CMAKE_BINARY_DIR}/clicache/packages/Microsoft.VisualStudio.TestPlatform.14.0.0.1/lib/net20/Microsoft.VisualStudio.TestPlatform.TestFramework.dll"
VS_DOTNET_REFERENCE_Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions
"${CMAKE_BINARY_DIR}/clicache/packages/Microsoft.VisualStudio.TestPlatform.14.0.0.1/lib/net20/Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll"
diff --git a/tests/cli/CMakeLists.txt b/tests/cli/CMakeLists.txt
index f48a390..973a690 100644
--- a/tests/cli/CMakeLists.txt
+++ b/tests/cli/CMakeLists.txt
@@ -31,7 +31,6 @@ else()
endif()
# Set the .NET Target Framework (Note: This should match the build for
Apache.Geode.)
-set (DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION})
foreach(var CMAKE_CURRENT_SOURCE_DIR CMAKE_SOURCE_DIR CMAKE_BINARY_DIR
CMAKE_CURRENT_BINARY_DIR)
file(TO_NATIVE_PATH ${${var}} ${var}_NATIVE)
diff --git a/tests/cli/NewFwkLib/NewFwkLib.csproj.in
b/tests/cli/NewFwkLib/NewFwkLib.csproj.in
index 8263912..4489ba5 100644
--- a/tests/cli/NewFwkLib/NewFwkLib.csproj.in
+++ b/tests/cli/NewFwkLib/NewFwkLib.csproj.in
@@ -87,7 +87,7 @@
<ProjectReference
Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- </ProjectReference>
+ </ProjectReference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
diff --git a/tests/cli/PdxClassLibrary/CMakeLists.txt
b/tests/cli/PdxClassLibrary/CMakeLists.txt
index f15a179..9ce4a6f 100644
--- a/tests/cli/PdxClassLibrary/CMakeLists.txt
+++ b/tests/cli/PdxClassLibrary/CMakeLists.txt
@@ -37,7 +37,6 @@ set_target_properties( PdxClassLibrary PROPERTIES
VS_GLOBAL_ROOTNAMESPACE PdxClassLibrary
VS_GLOBAL_TreatWarningsAsErrors True
VS_GLOBAL_PROJECT_TYPES "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCES "System;System.Xml;System.Data"
FOLDER cli/test/integration
)
diff --git a/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
b/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
index baf9643..95541fd 100644
--- a/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
+++ b/tests/cli/PdxVersion1Lib/PdxVersion1Lib.csproj.in
@@ -109,7 +109,7 @@
<ProjectReference
Include="$(CMAKE_BINARY_DIR)\clicache\src\Apache.Geode.vcxproj">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
- </ProjectReference>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="$(CMAKE_CURRENT_SOURCE_DIR)\PdxVersion1Lib\Version1.cs">
diff --git a/tests/cli/PkcsWrapper/CMakeLists.txt
b/tests/cli/PkcsWrapper/CMakeLists.txt
index be7c8d1..366f185 100644
--- a/tests/cli/PkcsWrapper/CMakeLists.txt
+++ b/tests/cli/PkcsWrapper/CMakeLists.txt
@@ -32,7 +32,6 @@ set_target_properties(PkcsWrapper PROPERTIES
VS_GLOBAL_KEYWORD "ManagedCProj"
VS_GLOBAL_PROJECT_TYPES "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
VS_GLOBAL_ROOTNAMESPACE "Apache.Geode.Client.Tests"
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCES "System;System.Xml"
)
diff --git a/tests/cli/QueryHelper/CMakeLists.txt
b/tests/cli/QueryHelper/CMakeLists.txt
index 94d632b..03164d2 100644
--- a/tests/cli/QueryHelper/CMakeLists.txt
+++ b/tests/cli/QueryHelper/CMakeLists.txt
@@ -27,7 +27,6 @@ set_target_properties(QueryWrapper PROPERTIES
VS_GLOBAL_KEYWORD "ManagedCProj"
VS_GLOBAL_PROJECT_TYPES "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
VS_GLOBAL_ROOTNAMESPACE "Apache.Geode.Client.Tests"
- VS_DOTNET_TARGET_FRAMEWORK_VERSION ${DOTNET_TARGET_FRAMEWORK_VERSION}
VS_DOTNET_REFERENCES "System;System.Xml"
)
