-
Notifications
You must be signed in to change notification settings - Fork 183
Bump CMake to 4.2.3 and boost to 1.90 #6135
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
Changes from all commits
d35307c
cb96af0
05ab666
73ef176
3c98cff
e99289c
0d29648
371e823
1b1f69d
82b7bc3
c81be61
0a0a07b
16be12f
818557a
aab46f6
9ad4b18
8a69f94
26769f3
68dc2cf
eef555b
3286163
d125d9d
42b4118
e33bd80
a316427
9e0ffad
1f6b6db
dd273bb
20a6e5a
d0463e0
44d2a70
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,28 +1,41 @@ | ||||||
| package: treelite | ||||||
| version: "%(tag_basename)s" | ||||||
| tag: "8498081" | ||||||
| tag: "df6a892b7faf532aea13bacc0f30b8a4743f82cf" | ||||||
| source: https://github.com/dmlc/treelite | ||||||
| requires: | ||||||
| - "GCC-Toolchain:(?!osx)" | ||||||
| - fmt | ||||||
| - RapidJSON | ||||||
| license: Apache-2.0 | ||||||
| build_requires: | ||||||
| - CMake | ||||||
| - "Xcode:(osx.*)" | ||||||
| --- | ||||||
| #!/bin/bash -e | ||||||
|
|
||||||
| case $ARCHITECTURE in | ||||||
| osx*) | ||||||
| # If we preferred system tools, we need to make sure we can pick them up. | ||||||
| [[ ! $FMT_ROOT ]] && FMT_ROOT=`brew --prefix fmt` | ||||||
|
Check notice on line 19 in treelite.sh
|
||||||
| ;; | ||||||
| *) ;; | ||||||
| esac | ||||||
|
|
||||||
| rsync -a $SOURCEDIR/ src/ | ||||||
| pushd src | ||||||
| git submodule update --init --recursive | ||||||
| sed -i.deleteme "s/RAPIDJSON_INCLUDE_DIRS/RapidJSON_INCLUDE_DIRS/g" cmake/ExternalLibs.cmake | ||||||
| popd | ||||||
|
|
||||||
| cmake src \ | ||||||
| ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ | ||||||
| -DCMAKE_POLICY_VERSION_MINIMUM=3.27 \ | ||||||
| -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ | ||||||
| -DUSE_OPENMP=OFF | ||||||
|
|
||||||
| cmake --build . -- ${JOBS:+-j$JOBS} install | ||||||
|
|
||||||
| [[ -d $INSTALLROOT/lib64 ]] && [[ ! -d $INSTALLROOT/lib ]] && ln -sf ${INSTALLROOT}/lib64 $INSTALLROOT/lib | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
I guess a relative link should fix it.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is actually a way to tell CMake to use lib rather than lib64. I would use that. @singiamtel can you have a look?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I only vaguely remember, but I think I tried the CMake libdir setting, and it failed for some reason, that is why I put the symlink. We can of course try to fix it the "correct" way, but if that causes issues, I would just create a relative symlink.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's see if #6213 fixes it. |
||||||
|
|
||||||
| # Modulefile | ||||||
| MODULEDIR="$INSTALLROOT/etc/modulefiles" | ||||||
| MODULEFILE="$MODULEDIR/$PKGNAME" | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The symlink
lib -> lib64is not relocated which is currently breaking the AliPhysics CI builds: