You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2021/10/12 22:09:21 UTC
[geode-native] branch develop updated: GEODE-9688: net-core builds
only for x64 (#878)
This is an automated email from the ASF dual-hosted git repository.
bbender 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 a990bc4 GEODE-9688: net-core builds only for x64 (#878)
a990bc4 is described below
commit a990bc4a140dc4eb29483c390d1df76b74e062a6
Author: Ernie Burghardt <eb...@pivotal.io>
AuthorDate: Tue Oct 12 15:09:17 2021 -0700
GEODE-9688: net-core builds only for x64 (#878)
* GEODE-9688: net-core builds only for x64
* Fix path for install
* Specifiy platform for test runs
---
netcore/netcore-integration-test/CMakeLists.txt | 6 +++---
netcore/netcore-lib/CMakeLists.txt | 9 +++++++--
netcore/netcore-session-integration-test/CMakeLists.txt | 6 +++---
netcore/netcore-session/CMakeLists.txt | 2 +-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/netcore/netcore-integration-test/CMakeLists.txt b/netcore/netcore-integration-test/CMakeLists.txt
index 3b9c863..6a01fe7 100644
--- a/netcore/netcore-integration-test/CMakeLists.txt
+++ b/netcore/netcore-integration-test/CMakeLists.txt
@@ -15,8 +15,8 @@
project(netcore-test LANGUAGES NONE)
add_custom_target(netcore-integration-test ALL
- COMMAND ${DOTNET} build netcore-integration-test.csproj --configuration $<CONFIG>
- COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:apache-geode-c> ${CMAKE_CURRENT_SOURCE_DIR}/bin/$<CONFIG>/netcoreapp3.1/
+ COMMAND ${DOTNET} build netcore-integration-test.csproj -p:platform=x64 --configuration $<CONFIG>
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:apache-geode-c> ${CMAKE_CURRENT_SOURCE_DIR}/bin/x64/$<CONFIG>/netcoreapp3.1/
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c netcore-lib netcore-utility VERBATIM)
enable_testing()
@@ -25,6 +25,6 @@ set(AUTH_OPTS "--J=-Dgemfire.security-username=server --J=-Dgemfire.security-pas
set(AUTH_LOCATOR_OPTS "${AUTH_OPTS} --J=-Dgemfire.security-manager=javaobject.SimpleSecurityManager")
add_test(NAME netcore-test
- COMMAND dotnet test -c $<CONFIG>
+ COMMAND dotnet test -c $<CONFIG> -p:platform=x64
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/netcore/netcore-lib/CMakeLists.txt b/netcore/netcore-lib/CMakeLists.txt
index 3128c63..ea13083 100644
--- a/netcore/netcore-lib/CMakeLists.txt
+++ b/netcore/netcore-lib/CMakeLists.txt
@@ -14,7 +14,12 @@
# limitations under the License.
project(netcore-lib LANGUAGES NONE)
-add_custom_target(netcore-lib ALL COMMAND ${DOTNET} build netcore-lib.csproj --configuration $<CONFIG>
+add_custom_target(netcore-lib ALL COMMAND ${DOTNET} build netcore-lib.csproj -p:platform=x64 --configuration $<CONFIG>
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c VERBATIM)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bin/$<CONFIG>/netcoreapp3.1/Apache.Geode.NetCore.dll DESTINATION ./lib)
+if (WIN32)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bin/x64/$<CONFIG>/netcoreapp3.1/Apache.Geode.NetCore.dll DESTINATION ./bin)
+else ()
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bin/x64/$<CONFIG>/netcoreapp3.1/Apache.Geode.NetCore.dll DESTINATION ./lib)
+endif()
+
diff --git a/netcore/netcore-session-integration-test/CMakeLists.txt b/netcore/netcore-session-integration-test/CMakeLists.txt
index 365cbe0..9aa4d4e 100644
--- a/netcore/netcore-session-integration-test/CMakeLists.txt
+++ b/netcore/netcore-session-integration-test/CMakeLists.txt
@@ -15,12 +15,12 @@
project(netcore-session-integrationtest LANGUAGES NONE)
add_custom_target(netcore-session-integration-test ALL
- COMMAND ${DOTNET} build netcore-session-integration-test.csproj --configuration $<CONFIG>
- COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:apache-geode-c> ${CMAKE_CURRENT_SOURCE_DIR}/bin/$<CONFIG>/netcoreapp3.1/
+ COMMAND ${DOTNET} build netcore-session-integration-test.csproj -p:platform=x64 --configuration $<CONFIG>
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:apache-geode-c> ${CMAKE_CURRENT_SOURCE_DIR}/bin/x64/$<CONFIG>/netcoreapp3.1/
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c netcore-session VERBATIM)
enable_testing()
add_test(NAME netcore-session-test
- COMMAND dotnet test -c $<CONFIG>
+ COMMAND dotnet test -c $<CONFIG> -p:platform=x64
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/netcore/netcore-session/CMakeLists.txt b/netcore/netcore-session/CMakeLists.txt
index 6456dc6..37c122e 100644
--- a/netcore/netcore-session/CMakeLists.txt
+++ b/netcore/netcore-session/CMakeLists.txt
@@ -14,5 +14,5 @@
# limitations under the License.
project(netcore-session LANGUAGES NONE)
-add_custom_target(netcore-session ALL COMMAND ${DOTNET} build netcore-session.csproj --configuration $<CONFIG>
+add_custom_target(netcore-session ALL COMMAND ${DOTNET} build netcore-session.csproj -p:platform=x64 --configuration $<CONFIG>
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c netcore-integration-test VERBATIM)