Skip to content

Commit

Permalink
test pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
gherynos committed Apr 14, 2024
1 parent 5cd99f8 commit c5a882b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,8 @@ jobs:
# mvn compile
cmake -D Boost_INCLUDE_DIR=.\boost_libs -D MSGPACK_INCLUDE_DIR="C:/Program Files (x86)/msgpack-cxx/include/" -D LIBSODIUM_INCLUDE_DIRS=.\libsodium\include -D LIBSODIUM_LIBRARIES=.\libsodium\x64\Release\v143\static\libsodium.lib -D LIBSALTPACK_INCLUDE_DIRS=.\libsaltpack-0.3.3\include -D LIBSALTPACK_LIBRARIES=.\libsaltpack-0.3.3\Release\saltpack.lib .
msbuild saltpack-jni.vcxproj -t:rebuild -property:Configuration=Release
# cp ./Release/* .
# mvn exec:java -D exec.mainClass="com.gherynos.libsaltpack.Loader"
cd Release
dir
mvn exec:java -D exec.mainClass="com.gherynos.libsaltpack.Loader"
mvn test
# unix:
# strategy:
Expand Down
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
cmake_minimum_required(VERSION 3.13)
project(saltpack-jni)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
if(MSVC)
set(MSVC_COMPILER_DEFS "-D_VARIADIC_MAX=10") #vc 2012 fix for vararg templates
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
endif()

IF(WIN32)
Expand All @@ -21,9 +23,6 @@ set(SOURCE_FILES src/main/cpp/InputStreamWrapper.cpp src/main/cpp/OutputStreamWr
set(HEADER_FILES src/main/cpp/include/common.h src/main/cpp/include/InputStreamWrapper.h src/main/cpp/include/OutputStreamWrapper.h src/main/cpp/include/com_gherynos_libsaltpack_MessageReader.h src/main/cpp/include/com_gherynos_libsaltpack_MessageWriter.h src/main/cpp/include/com_gherynos_libsaltpack_Utils.h)

add_library(saltpack-jni SHARED ${SOURCE_FILES} ${HEADER_FILES})
#if(MSVC)
# target_compile_definitions(saltpack-jni PRIVATE SODIUM_STATIC)
#endif()

# JNI
find_package(JNI REQUIRED)
Expand Down

0 comments on commit c5a882b

Please sign in to comment.