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

Feature/vcpkg linux #2078

Merged
merged 58 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a5ace26
VCPKG manifest mode with minizip and boost only, ubuntu
sylvlecl May 2, 2024
a532ded
Fix VCPKG install
sylvlecl May 2, 2024
4d88b9f
To be reverted: disable temporarily non-ununtu CIs
sylvlecl May 2, 2024
01c1719
Fix toolchain file path
sylvlecl May 2, 2024
ce6f0ee
Fix wxWidgets search
sylvlecl May 2, 2024
aaf56be
Revert boost from vcpkg for now
sylvlecl May 2, 2024
8215e8c
Save cache even when build fails
sylvlecl May 2, 2024
ff51823
Fix cache key
sylvlecl May 2, 2024
33541eb
Restore windows build
sylvlecl May 2, 2024
54d2717
Fix vcpkg install
sylvlecl May 2, 2024
4fa2567
Try fixing toolchain path
sylvlecl May 2, 2024
ddf60fd
Try fiwing workspace path
sylvlecl May 2, 2024
82f866b
Another try
sylvlecl May 2, 2024
fb49715
Try improving cache logic
sylvlecl May 2, 2024
c64b687
Add boost to windows build
sylvlecl May 2, 2024
a71f0ca
Try with centos
sylvlecl May 2, 2024
1b19dfb
No VCPKG cache for centos, for now
sylvlecl May 2, 2024
eeca546
Try to fix path to vcpkg
sylvlecl May 2, 2024
bcb14cc
Log for debugging
sylvlecl May 2, 2024
64b59bb
Try install cmake with pip instead
sylvlecl May 2, 2024
8d996a1
More logs
sylvlecl May 2, 2024
5e26bbd
Temporarily disable ubuntu & windows
sylvlecl May 2, 2024
c6fa5b9
Try fix path
sylvlecl May 2, 2024
3339c9e
Restore gcc install
sylvlecl May 2, 2024
e675c96
Again another try
sylvlecl May 2, 2024
9e426f8
Fix git version
sylvlecl May 2, 2024
72f62ef
Fix packaging too
sylvlecl May 2, 2024
b3de6f3
Try oracle 8
sylvlecl May 2, 2024
cd23b2c
Fix security error
sylvlecl May 2, 2024
83331e0
Revert "Temporarily disable ubuntu & windows"
sylvlecl May 3, 2024
6b71d90
Hashing after submodule update
sylvlecl May 3, 2024
62a6e8f
Fix restore keys
sylvlecl May 3, 2024
0a52474
Disable ubuntu & windows
sylvlecl May 3, 2024
9f3b2c1
Try cache action downgraded
sylvlecl May 3, 2024
e4953d5
Try cache action v3 on centos7
sylvlecl May 3, 2024
512a091
Add actual caching
sylvlecl May 3, 2024
046436d
Try env vars
sylvlecl May 3, 2024
ff0d261
Skip some tests for testing
sylvlecl May 3, 2024
3e78a3c
fix
sylvlecl May 3, 2024
3e1ea50
fix
sylvlecl May 3, 2024
1671e1e
Revert "Skip some tests for testing"
sylvlecl May 3, 2024
af6210d
Fix vcpkg cache paths on centos
sylvlecl May 3, 2024
66bf8fa
Revert "Disable ubuntu & windows"
sylvlecl May 3, 2024
53dfa9b
Disable centos and oracle on PRs
sylvlecl May 3, 2024
8e49f12
Merge remote-tracking branch 'origin/develop' into feature/vcpkg-linux
sylvlecl May 3, 2024
be5b618
Restore sonarcloud
sylvlecl May 3, 2024
a914c32
Fix windows workflow file
sylvlecl May 3, 2024
40a9f3b
VCPKG for sonar job
sylvlecl May 3, 2024
fd13a66
Merge branch 'feature/vcpkg-dependencies' into feature/vcpkg-linux
sylvlecl May 13, 2024
d4924c9
Support minizip dependency as minizip or minizip-ng
sylvlecl May 11, 2024
1b16bda
Empty commit to test GH caching
flomnes May 14, 2024
e2694b5
Add custom triplets to:
sylvlecl May 16, 2024
e526cba
Fix build type in triplets
sylvlecl May 16, 2024
5bc828e
Fix windows triplets
sylvlecl May 16, 2024
f2546c4
Boost available on linux too
JasonMarechal25 May 29, 2024
46788eb
Merge branch 'develop' into feature/vcpkg-linux
JasonMarechal25 May 29, 2024
38c49f6
Feature/vcpkg linux fixes (#2127)
JasonMarechal25 May 30, 2024
ebae478
Merge branch 'develop' into feature/vcpkg-linux
JasonMarechal25 May 30, 2024
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
Support minizip dependency as minizip or minizip-ng
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
  • Loading branch information
sylvlecl committed May 14, 2024
commit d4924c9d3938e444cbefdb5a12b21503a579aad3
12 changes: 11 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,17 @@ message(STATUS "OR-Tools tag ${ORTOOLS_TAG}")
FetchContent_MakeAvailable(ortools)
endif()

find_package(minizip-ng REQUIRED)
find_package(minizip-ng)
if (minizip-ng_FOUND)
add_library(MINIZIP::minizip ALIAS MINIZIP::minizip-ng)
else ()
find_package(minizip)
if (minizip_FOUND)
message (STATUS "Found minizip (not minizip-ng).")
else ()
message (FATAL_ERROR "Minizip not found.")
endif ()
endif ()

#wxWidget not needed for all library find is done in ui CMakeLists.txt
if (VCPKG_TOOLCHAIN AND NOT BUILD_wxWidgets)
Expand Down
2 changes: 1 addition & 1 deletion src/libs/antares/writer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ target_link_libraries(result_writer
Antares::benchmarking
yuni-static-core
PRIVATE
MINIZIP::minizip-ng
MINIZIP::minizip
logs
inifile
io
Expand Down
10 changes: 9 additions & 1 deletion src/packaging/Config.cmake.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(ortools)
find_dependency(ortools REQUIRED)
find_dependency(minizip-ng)
if (minizip-ng_FOUND)
add_library(MINIZIP::minizip ALIAS MINIZIP::minizip-ng)
else ()
find_dependency(minizip)
if (NOT minizip_FOUND)
message (FATAL_ERROR "Minizip dependency (minizip or minizip-ng) not found.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

specify minimal version? according to this commit, at least v 3.0.7 and back are incompatible with Simulator.
minizip target is confusing it actually refers to minizip-ng and not the "original" project

endif ()
endif ()

include("${CMAKE_CURRENT_LIST_DIR}/AntaresTargets.cmake")

Expand Down
Loading