This is an automated email from the ASF dual-hosted git repository. echobravo pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit c6d72b0b520c3cc42971d832a145eb2b8e02b23f Author: Blake Bender <bben...@pivotal.io> AuthorDate: Wed Feb 21 19:06:54 2018 +0000 WIP: seems to be all working now --- .../CMakeLists.txt | 6 ++++ examples/dotnet/Apache.Geode.Examples.sln | 33 ---------------------- examples/dotnet/CMakeLists.txt | 3 +- examples/dotnet/README.md | 10 +++++-- examples/dotnet/cmake/FindGeodeAssembly.cmake | 16 ----------- 5 files changed, 15 insertions(+), 53 deletions(-) diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt b/examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt index ab638b8..3a8d7e1 100644 --- a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt +++ b/examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt @@ -17,6 +17,12 @@ cmake_minimum_required(VERSION 3.8.2) project(PutGetRemove CSharp) +message(STATUS "Assembly is ${GEODE_ASSEMBLY}") + +if ("${GEODE_ASSEMBLY}" STREQUAL "") + message(FATAL_ERROR "GEODE_ASSEMBLY not set, examples will not build without it") +endif() + add_executable(${PROJECT_NAME} Program.cs) diff --git a/examples/dotnet/Apache.Geode.Examples.sln b/examples/dotnet/Apache.Geode.Examples.sln deleted file mode 100644 index 8ee70be..0000000 --- a/examples/dotnet/Apache.Geode.Examples.sln +++ /dev/null @@ -1,33 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Geode.Examples.PutGetRemove", "Apache.Geode.Examples.PutGetRemove\Apache.Geode.Examples.PutGetRemove.csproj", "{15ACFB5B-0D2C-4C38-9236-7AF01874A84F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Geode.Examples.AuthInitialize", "Apache.Geode.Examples.AuthInitialize\Apache.Geode.Examples.AuthInitialize.csproj", "{047FC72E-F06D-4F3A-9EF3-B66FAE4B6C36}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CB7AB243-26A9-4B20-8ED9-5D35D12F9FF3}" - ProjectSection(SolutionItems) = preProject - README.md = README.md - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {15ACFB5B-0D2C-4C38-9236-7AF01874A84F}.Debug|x64.ActiveCfg = Debug|x64 - {15ACFB5B-0D2C-4C38-9236-7AF01874A84F}.Debug|x64.Build.0 = Debug|x64 - {15ACFB5B-0D2C-4C38-9236-7AF01874A84F}.Release|x64.ActiveCfg = Release|x64 - {15ACFB5B-0D2C-4C38-9236-7AF01874A84F}.Release|x64.Build.0 = Release|x64 - {047FC72E-F06D-4F3A-9EF3-B66FAE4B6C36}.Debug|x64.ActiveCfg = Debug|x64 - {047FC72E-F06D-4F3A-9EF3-B66FAE4B6C36}.Debug|x64.Build.0 = Debug|x64 - {047FC72E-F06D-4F3A-9EF3-B66FAE4B6C36}.Release|x64.ActiveCfg = Release|x64 - {047FC72E-F06D-4F3A-9EF3-B66FAE4B6C36}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/examples/dotnet/CMakeLists.txt b/examples/dotnet/CMakeLists.txt index 96223d1..db538ad 100644 --- a/examples/dotnet/CMakeLists.txt +++ b/examples/dotnet/CMakeLists.txt @@ -13,8 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. cmake_minimum_required(VERSION 3.4) -project(examples) -include(cmake/FindGeodeAssembly.cmake) +project(Apache.Geode.Examples) add_subdirectory(Apache.Geode.Examples.PutGetRemove) diff --git a/examples/dotnet/README.md b/examples/dotnet/README.md index 9b66b74..ebb76d4 100644 --- a/examples/dotnet/README.md +++ b/examples/dotnet/README.md @@ -2,6 +2,7 @@ ## Prerequisites * Install [Apache Geode](https://geode.apache.org) +* Install [CMake](https://cmake.org/download/) * Build and install [Apache Geode Native](https://github.com/apache/geode-native) ## Examples @@ -9,6 +10,11 @@ * [Apache.Geode.Examples.Cache](Apache.Geode.Examples.Cache/README.md) ## Using -1) Open `Apache.Geode.Examples.sln` in [Visual Studio 2015](https://www.visualstudio.com/) +1) Use cmake to generate the .sln and .vcxproj files for the Examples +``` + cd examples\dotnet + mkdir build + cmake .. -G"Visual Studio 14 2015 Win64" -DGEODE_ASSEMBLY=C:\path\to\Apache.Geode.dll -Thost=x64 +``` +2) Open `Apache.Geode.Examples.sln` in [Visual Studio 2015](https://www.visualstudio.com/) or newer. -2) Update `Apache.Geode` reference in each project to the `Apache.Geode.dll` assembly. \ No newline at end of file diff --git a/examples/dotnet/cmake/FindGeodeAssembly.cmake b/examples/dotnet/cmake/FindGeodeAssembly.cmake deleted file mode 100644 index 3c0208c..0000000 --- a/examples/dotnet/cmake/FindGeodeAssembly.cmake +++ /dev/null @@ -1,16 +0,0 @@ -set(GEODE_ASSEMBLY_DEBUG_IN_BUILT_SOURCE_TREE "${CMAKE_CURRENT_SOURCE_DIR}/../../build/clicache/src/Debug/Apache.Geode.dll") -set(GEODE_ASSEMBLY_IN_BUILT_SOURCE_TREE "${CMAKE_CURRENT_SOURCE_DIR}/../../build/clicache/src/Release/Apache.Geode.dll") -set(GEODE_ASSEMBLY_IN_INSTALL_TREE "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/Apache.Geode.dll") - - -if (EXISTS ${GEODE_ASSEMBLY_IN_INSTALL_TREE}) - set(GEODE_ASSEMBLY ${GEODE_ASSEMBLY_IN_INSTALL_TREE}) -elseif (EXISTS ${GEODE_ASSEMBLY_DEBUG_IN_BUILT_SOURCE_TREE}) - set(GEODE_ASSEMBLY ${GEODE_ASSEMBLY_DEBUG_IN_BUILT_SOURCE_TREE}) -elseif (EXISTS ${GEODE_ASSEMBLY_IN_BUILT_SOURCE_TREE}) - set(GEODE_ASSEMBLY ${GEODE_ASSEMBLY_IN_BUILT_SOURCE_TREE}) -else() - set(GEODE_ASSEMBLY "GEODE_ASSEMBLY-NOT_FOUND") -endif() - -message(STATUS "Geode assembly located at ${GEODE_ASSEMBLY}") -- To stop receiving notification emails like this one, please contact echobr...@apache.org.