Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create jar file from CI #29

Merged
merged 50 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
d475148
Upgrade SuiteSparse to 7.3.1
geofjamg Nov 14, 2023
27995a2
Wip
geofjamg Nov 14, 2023
e79d088
Wip
geofjamg Nov 14, 2023
df2183e
Wip
geofjamg Nov 14, 2023
df894b4
Wip
geofjamg Nov 14, 2023
b4421da
Wip
geofjamg Nov 14, 2023
33f901a
Wip
geofjamg Nov 14, 2023
536c2db
Wip
geofjamg Nov 14, 2023
22abdf4
Wip
geofjamg Nov 14, 2023
c47fdd7
Wip
geofjamg Nov 14, 2023
609142c
Wip
geofjamg Nov 14, 2023
17481d8
Wip
geofjamg Nov 14, 2023
3ab9316
Wip
geofjamg Nov 15, 2023
26da1ab
Wip
geofjamg Nov 15, 2023
3d03206
Wip
geofjamg Nov 15, 2023
5bed0da
Wip
geofjamg Nov 15, 2023
084055a
Wip
geofjamg Nov 15, 2023
ce029f7
Wip
geofjamg Nov 15, 2023
673802f
Wip
geofjamg Nov 15, 2023
ab08ff1
Wip
geofjamg Nov 15, 2023
439b2d8
Wip
geofjamg Nov 15, 2023
cfb5238
Wip
geofjamg Nov 15, 2023
c4d7e15
Wip
geofjamg Nov 15, 2023
ca5b2fe
Wip
geofjamg Nov 15, 2023
7dcdf6f
Wip
geofjamg Nov 15, 2023
9155675
Wip
geofjamg Nov 15, 2023
5c82c30
Wip
geofjamg Nov 15, 2023
ab64d93
Wip
geofjamg Nov 15, 2023
0205aca
Wip
geofjamg Nov 15, 2023
44c8272
Wip
geofjamg Nov 15, 2023
70c5a88
Wip
geofjamg Nov 15, 2023
ac3607a
Wip
geofjamg Nov 15, 2023
c0a3171
Wip
geofjamg Nov 15, 2023
c1a5c76
Wip
geofjamg Nov 15, 2023
cb3c1b8
Merge remote-tracking branch 'origin/suitesparse731' into suitesparse731
geofjamg Nov 15, 2023
e27ea90
Wip
geofjamg Nov 16, 2023
0efa2e8
Wip
geofjamg Nov 16, 2023
1ee649f
Wip
geofjamg Nov 16, 2023
13f2174
Wip
geofjamg Nov 16, 2023
7d74e2a
Wip
geofjamg Nov 16, 2023
b648033
Package libraries to Jar
geofjamg Nov 16, 2023
8434c0f
Wip
geofjamg Nov 16, 2023
0805067
Wip
geofjamg Nov 16, 2023
f05e67f
Wip
geofjamg Nov 16, 2023
9ecbb88
Wip
geofjamg Nov 16, 2023
8e64e06
Wip
geofjamg Nov 16, 2023
7e439f7
Wip
geofjamg Nov 16, 2023
51fb5b7
Merge branch 'main' into package
geofjamg Nov 17, 2023
f190967
Wip
geofjamg Nov 17, 2023
063294b
Wip
geofjamg Nov 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into package
# Conflicts:
#	.github/workflows/ci.yml
#	CMakeLists.txt
  • Loading branch information
geofjamg committed Nov 17, 2023
commit 51fb5b778b34ffe5a4ec5bbdeae4c59c24d202a5
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ jobs:
- {
name: windows,
os: windows-2019,
artifact_name: math.dll,
artifact_path: Release
artifact_name: math.dll
}

steps:
Expand Down Expand Up @@ -67,7 +66,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.config.artifact_name }}
path: ${{ runner.workspace }}/powsybl-math-native/build/${{ matrix.config.artifact_path }}/${{ matrix.config.artifact_name }}
path: ${{ runner.workspace }}/powsybl-math-native/build/${{ matrix.config.artifact_name }}

package:
name: Package libraries to JAR
Expand Down
6 changes: 2 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@ ExternalProject_Add(suitesparse_cxsparse
set(SUITE_SPARSE_LIB_DIR ${THIRD_PARTY_DIR}/suitesparse/lib)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
set(SUITE_SPARSE_LIB_PREFIX "")
set(SUITE_SPARSE_LIB_POSTFIX "_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
else()
set(SUITE_SPARSE_LIB_PREFIX lib)
endif()
set(SUITE_SPARSE_LIB_POSTFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(SUITE_SPARSE_LIB_POSTFIX d${CMAKE_STATIC_LIBRARY_SUFFIX})
set(SUITE_SPARSE_LIB_POSTFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
endif()

set(SUITE_SPARSE_CONFIG_LIB ${SUITE_SPARSE_LIB_DIR}/${SUITE_SPARSE_LIB_PREFIX}suitesparseconfig${SUITE_SPARSE_LIB_POSTFIX})
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.