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

pixi: add simage #126

Merged
merged 5 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions interfaces/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ swig_add_library(coin

if (APPLE)
set_target_properties(coin PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
elseif (WIN32)
elseif (MSVC)
set_target_properties(coin PROPERTIES COMPILE_FLAGS "/bigobj")
elseif(WIN32)
target_link_libraries(coin PUBLIC ${Python_LIBRARIES})
endif ()

Expand Down Expand Up @@ -61,8 +62,9 @@ if (SoQt_FOUND)

if (APPLE)
set_target_properties(soqt PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
elseif (WIN32)
elseif (MSVC)
set_target_properties(coin PROPERTIES COMPILE_FLAGS "/bigobj")
elseif (WIN32)
target_link_libraries(soqt PUBLIC ${Python_LIBRARIES})
endif ()

Expand Down
97 changes: 97 additions & 0 deletions pixi.lock
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/linux-64/qt6-main-6.7.2-hadfd74e_5.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/rhash-1.4.4-hd590300_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/simage-1.8.3-heeb6533_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/soqt6-1.6.2-he24bac0_2.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/swig-4.2.1-hfb18ccb_1.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.17-h4a8ded7_16.conda
Expand Down Expand Up @@ -238,6 +239,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/qt6-main-6.7.2-hfe1ece3_5.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/readline-8.2-h8fc344f_1.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/rhash-1.4.4-h31becfc_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/simage-1.8.3-h3825e49_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/soqt6-1.6.2-hce2475e_2.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/swig-4.2.1-h0a98329_1.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-aarch64-2.17-h5b4a56d_16.conda
Expand Down Expand Up @@ -339,6 +341,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/osx-64/qt6-main-6.7.2-h03d9f68_5.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/readline-8.2-h9e318b2_1.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/rhash-1.4.4-h0dc2134_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/simage-1.8.3-hed17058_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/soqt6-1.6.2-h7b53577_2.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/swig-4.2.1-h5c5c8f3_1.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.13-h1abcd95_1.conda
Expand Down Expand Up @@ -412,6 +415,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/qt6-main-6.7.2-h92f6480_5.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.2-h92ec313_1.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/rhash-1.4.4-hb547adb_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/simage-1.8.3-hd9f18ba_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/soqt6-1.6.2-h708156c_2.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/swig-4.2.1-hd6c3d49_1.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.13-h5083fa2_1.conda
Expand Down Expand Up @@ -477,6 +481,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/win-64/python-3.12.6-hce54a09_1_cpython.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.12-5_cp312.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/qt6-main-6.7.2-h2fedb45_5.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/simage-1.8.3-h28af234_0.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/soqt6-1.6.2-h796eb14_2.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/swig-4.2.1-h51fbe9b_1.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/tk-8.6.13-h5226925_1.conda
Expand Down Expand Up @@ -6811,6 +6816,98 @@ packages:
license_family: MIT
size: 185144
timestamp: 1693455923632
- kind: conda
name: simage
version: 1.8.3
build: h28af234_0
subdir: win-64
url: https://conda.anaconda.org/conda-forge/win-64/simage-1.8.3-h28af234_0.conda
sha256: ee394356c60e3e17ef831d8f670924aff0a43c54a7cf8b3fdfa546b4e946f8c8
md5: 17482fe2e4ebb84fe02d5fb73a7c94f6
depends:
- libjpeg-turbo >=3.0.0,<4.0a0
- libpng >=1.6.44,<1.7.0a0
- qt6-main >=6.7.2,<6.8.0a0
- ucrt >=10.0.20348.0
- vc >=14.2,<15
- vc14_runtime >=14.29.30139
license: BSD 3-Clause
license_family: BSD
size: 85158
timestamp: 1727210934131
- kind: conda
name: simage
version: 1.8.3
build: h3825e49_0
subdir: linux-aarch64
url: https://conda.anaconda.org/conda-forge/linux-aarch64/simage-1.8.3-h3825e49_0.conda
sha256: 4ceb745c5f1a87cd74aa3b56fab14cee45cc540836018f8770a5b68a6a04bfaa
md5: 7c72b34d7b91bb977fc2854a7c7bd1d5
depends:
- libgcc >=13
- libjpeg-turbo >=3.0.0,<4.0a0
- libpng >=1.6.44,<1.7.0a0
- libstdcxx >=13
- qt6-main >=6.7.2,<6.8.0a0
license: BSD 3-Clause
license_family: BSD
size: 125651
timestamp: 1727210432101
- kind: conda
name: simage
version: 1.8.3
build: hd9f18ba_0
subdir: osx-arm64
url: https://conda.anaconda.org/conda-forge/osx-arm64/simage-1.8.3-hd9f18ba_0.conda
sha256: 5a137c97fe203b3a23e4bbc81f230b6fa7d483f3bbf6af85ef9169c05ef62be4
md5: 67de33ca90d5f9dd381a4efa4814b9d7
depends:
- __osx >=11.0
- libcxx >=17
- libjpeg-turbo >=3.0.0,<4.0a0
- libpng >=1.6.44,<1.7.0a0
- qt6-main >=6.7.2,<6.8.0a0
license: BSD 3-Clause
license_family: BSD
size: 99595
timestamp: 1727210424510
- kind: conda
name: simage
version: 1.8.3
build: hed17058_0
subdir: osx-64
url: https://conda.anaconda.org/conda-forge/osx-64/simage-1.8.3-hed17058_0.conda
sha256: 08d0f883517fc66fc5d8885ffaec1494fae26eda7f762d97fcfb2118cacf677e
md5: bf6fc82817e7c1f6b6c3870109ced46f
depends:
- __osx >=10.13
- libcxx >=17
- libjpeg-turbo >=3.0.0,<4.0a0
- libpng >=1.6.44,<1.7.0a0
- qt6-main >=6.7.2,<6.8.0a0
license: BSD 3-Clause
license_family: BSD
size: 130936
timestamp: 1727210315519
- kind: conda
name: simage
version: 1.8.3
build: heeb6533_0
subdir: linux-64
url: https://conda.anaconda.org/conda-forge/linux-64/simage-1.8.3-heeb6533_0.conda
sha256: e3510a6057a333313e564d4260591d01a7c3e5347e1c14b7fde4cc39d856e2a0
md5: 03a05e3e1ccdfb584d68b12bb3f73847
depends:
- __glibc >=2.17,<3.0.a0
- libgcc >=13
- libjpeg-turbo >=3.0.0,<4.0a0
- libpng >=1.6.44,<1.7.0a0
- libstdcxx >=13
- qt6-main >=6.7.2,<6.8.0a0
license: BSD 3-Clause
license_family: BSD
size: 121434
timestamp: 1727210351796
- kind: conda
name: soqt6
version: 1.6.2
Expand Down
5 changes: 3 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
authors = ["Lorenz Lechner <[email protected]>"]
channels = ["conda-forge"]
description = "Add a short description here"
description = "combining building and dependency management with pixi"
name = "pivy"
platforms = ["osx-arm64", "linux-64", "linux-aarch64", "win-64", "osx-64"]
version = "0.1.0"
Expand All @@ -21,6 +21,7 @@ ninja = "*"
soqt6 = "*"
qt6-main = "*"
pyside6 = "*"
simage = "*"


[feature.build.target.linux-64.dependencies]
Expand Down Expand Up @@ -48,7 +49,7 @@ configure = { cmd = ["cmake", "-G", "Ninja", "-B", "build", "-S", ".",
"-D", "QT_HOST_PATH=$CONDA_PREFIX"
], depends-on = []}

build = { cmd = ["ninja", "-C", "build", "-j", "3", "install"], depends-on = ["configure"]}
build = { cmd = ["ninja", "-C", "build", "-j", "1", "install"], depends-on = ["configure"]}
test = { cmd = ["python", "tests/coin_tests.py"], depends-on = ["build"]}

[feature.lint.dependencies]
Expand Down
Loading