Skip to content

Commit

Permalink
Change build to use shared libraries (maybe).
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenmburns committed Nov 12, 2022
1 parent 5584336 commit 2e11952
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,12 @@ workflows:
parameters:
platform:
# - "quay.io/pypa/manylinux2010_x86_64" # PEP 571
- "quay.io/pypa/manylinux2014_x86_64" # PEP 599
# - "quay.io/pypa/manylinux2014_x86_64" # PEP 599
- "quay.io/pypa/manylinux_2_28_x86_64" # PEP 600
python-tags:
# - "cp37-cp37m"
- "cp38-cp38"
- "cp311-cp311"
- "cp310-cp310"
exclude:
# Skipping these as they have been built by
Expand Down
24 changes: 12 additions & 12 deletions PlaceRouteHierFlow/thirdparty/ilpif.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ if(NOT ilpsolverif_POPULATED)
add_library(ilp_solver::ilp_solver ALIAS ILPSolverIf)
else()
message(STATUS "ILP solver lib found in ${ilp_solver_lib}")
add_library(ilp_solver_if STATIC IMPORTED)
add_library(cbc_if STATIC IMPORTED)
add_library(clp_if STATIC IMPORTED)
add_library(cgl_if STATIC IMPORTED)
add_library(osi_if STATIC IMPORTED)
add_library(osiclp_if STATIC IMPORTED)
add_library(osicbc_if STATIC IMPORTED)
add_library(coinutils_if STATIC IMPORTED)
add_library(clpsolver_if STATIC IMPORTED)
add_library(cbcsolver_if STATIC IMPORTED)
add_library(sym_if STATIC IMPORTED)
add_library(osisym_if STATIC IMPORTED)
add_library(ilp_solver_if SHARED IMPORTED)

This comment has been minimized.

Copy link
@srini229

srini229 Nov 12, 2022

Collaborator

@stevenmburns SHARED libraries aren't built in the ilpsolverif. I'll modify the ilpsolverif git to build them.
One issue I found with shlib is that cbc library is built with subversion number in the extension .so (e.g. libCbcSolver.so.2.10.5) and the libCbcSolver.so is symlinked to that. I have to find a way to copy both the file and the symlink in CMake.

add_library(cbc_if SHARED IMPORTED)
add_library(clp_if SHARED IMPORTED)
add_library(cgl_if SHARED IMPORTED)
add_library(osi_if SHARED IMPORTED)
add_library(osiclp_if SHARED IMPORTED)
add_library(osicbc_if SHARED IMPORTED)
add_library(coinutils_if SHARED IMPORTED)
add_library(clpsolver_if SHARED IMPORTED)
add_library(cbcsolver_if SHARED IMPORTED)
add_library(sym_if SHARED IMPORTED)
add_library(osisym_if SHARED IMPORTED)
set_property(TARGET ilp_solver_if PROPERTY IMPORTED_LOCATION ${ilp_solver_lib})
target_include_directories(ilp_solver_if INTERFACE ${ilpsolverif_SOURCE_DIR}/ILPSolverIf)
target_include_directories(ilp_solver_if INTERFACE ${solver_search_path})
Expand Down

0 comments on commit 2e11952

Please sign in to comment.