Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
binary_c-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Izzard, Robert Dr (Maths & Physics)
binary_c-python
Commits
b0e044c9
Commit
b0e044c9
authored
5 years ago
by
Izzard, Robert Dr (Maths & Physics)
Browse files
Options
Downloads
Patches
Plain Diff
update meson build to better detect gsl
parent
993dbe27
No related branches found
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
meson.build
+4
-2
4 additions, 2 deletions
meson.build
src/disc/disc_new_zone_list.c
+1
-1
1 addition, 1 deletion
src/disc/disc_new_zone_list.c
with
5 additions
and
3 deletions
meson.build
+
4
−
2
View file @
b0e044c9
...
...
@@ -202,7 +202,8 @@ endif
############################################################
# dependencies that have pkg-config
libgsl_dep
=
dependency
(
'gsl'
)
libgsl_dep
=
compiler
.
find_library
(
'gsl'
,
required
:
true
)
############################################################
# dependencies that usually have no pkg-config
...
...
@@ -315,8 +316,9 @@ foreach idir : [
'/usr/local/include'
,
]
inc_arg
=
idir
_Inc_arg
=
'-I'
+
idir
if
not
found
and
compiler
.
has_header
(
'gsl/gsl_blas.h'
,
args
:
i
nc_arg
)
args
:
_I
nc_arg
)
my_incdirs
+=
[
inc_arg
]
found
=
true
endif
...
...
This diff is collapsed.
Click to expand it.
src/disc/disc_new_zone_list.c
+
1
−
1
View file @
b0e044c9
...
...
@@ -9,7 +9,7 @@ Boolean disc_new_zone_list(struct disc_t * const disc,
*
* The prefactors and exponents are defined in disc_thermal_zones.h
*
* Returns FALSE on failure, TRUE o
therwise
.
* Returns FALSE on failure, TRUE o
n success
.
*
* The parameter Tvisc0, which determines sigma0, hence the
* mass scaling, determines the profile of temperature in the disc.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment