Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Chameleon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
Chameleon
Commits
7f4befbd
Commit
7f4befbd
authored
3 months ago
by
PRUVOST Florent
Browse files
Options
Downloads
Patches
Plain Diff
Install chameleon_env in bin/ and use it in the gitlab-ci build job
parent
29bde9ef
No related branches found
No related tags found
1 merge request
!502
Update CI to fix sonarqube job and use chameleon_env script in build
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab/build.sh
+8
-16
8 additions, 16 deletions
.gitlab/build.sh
CMakeLists.txt
+2
-0
2 additions, 0 deletions
CMakeLists.txt
with
10 additions
and
16 deletions
.gitlab/build.sh
+
8
−
16
View file @
7f4befbd
...
...
@@ -64,10 +64,16 @@ eval '${SCAN}cmake --build build-${VERSION} -j 4 > /dev/null'
# Install
cmake
--install
build-
${
VERSION
}
#
# Check link to chameleon
#
cd
.gitlab/check_link/
# Set the path variables
if
[[
"
$SYSTEM
"
==
"windows"
]]
;
then
export
PATH
=
"/c/Windows/WinSxS/x86_microsoft-windows-m..namespace-downlevel_31bf3856ad364e35_10.0.19041.1_none_21374cb0681a6320"
:
$PATH
fi
source
install-
${
VERSION
}
/bin/chameleon_env
# Set the compiler
if
[[
"
$SYSTEM
"
==
"macosx"
]]
;
then
...
...
@@ -78,21 +84,7 @@ else
fi
export
FC
=
gfortran
# Set the path variables
if
[[
"
$SYSTEM
"
==
"guix"
]]
;
then
export
LIBRARY_PATH
=
$PWD
/../../install-
${
VERSION
}
/lib:
$LIBRARY_PATH
export
LD_LIBRARY_PATH
=
$PWD
/../../install-
${
VERSION
}
/lib:
$LD_LIBRARY_PATH
elif
[[
"
$SYSTEM
"
==
"linux"
]]
;
then
export
LIBRARY_PATH
=
$PWD
/../../install-
${
VERSION
}
/lib:
$LIBRARY_PATH
export
LD_LIBRARY_PATH
=
$PWD
/../../install-
${
VERSION
}
/lib:
$LD_LIBRARY_PATH
elif
[[
"
$SYSTEM
"
==
"macosx"
]]
;
then
export
LIBRARY_PATH
=
$PWD
/../../install-
${
VERSION
}
/lib:
$LIBRARY_PATH
export
DYLD_LIBRARY_PATH
=
$PWD
/../../install-
${
VERSION
}
/lib:
$DYLD_LIBRARY_PATH
elif
[[
"
$SYSTEM
"
==
"windows"
]]
;
then
export
PATH
=
"/c/Windows/WinSxS/x86_microsoft-windows-m..namespace-downlevel_31bf3856ad364e35_10.0.19041.1_none_21374cb0681a6320"
:
$PATH
export
PATH
=
$PWD
/../../install-
${
VERSION
}
/bin:
$PATH
fi
cd
.gitlab/check_link/
# 1) using cmake:
./link_cmake.sh
$PWD
/../../install-
${
VERSION
}
# 2) using pkg-config:
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
2
−
0
View file @
7f4befbd
...
...
@@ -821,6 +821,8 @@ include(ChameleonPkgConfig)
# Create .pc file
# ---------------
chameleon_generate_pkgconfig_files
()
generate_newenv_file
(
PACKAGE chameleon
)
#------------------------------------------------------------------------------
###############################################################################
...
...
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