Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
Visualization
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Modules
Visualization
Commits
bc703b3e
Commit
bc703b3e
authored
7 years ago
by
Mark OLESEN
Browse files
Options
Downloads
Patches
Plain Diff
COMP: better handling of versioned cmake libraries
- sentinel was not working properly when building user-space routines
parent
be0cc59a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/paraview-plugins/Allwmake
+4
-10
4 additions, 10 deletions
src/paraview-plugins/Allwmake
src/runTimePostProcessing/Allwmake
+3
-5
3 additions, 5 deletions
src/runTimePostProcessing/Allwmake
with
7 additions
and
15 deletions
src/paraview-plugins/Allwmake
+
4
−
10
View file @
bc703b3e
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
# Optional unit: continue-on-error
export
WM_CONTINUE_ON_ERROR
=
true
# Parse arguments for library compilation
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
# Source CMake functions
.
$WM_PROJECT_DIR
/wmake/scripts/cmakeFunctions
cd
${
0
%/*
}
||
exit
1
# Run from this directory
export
WM_CONTINUE_ON_ERROR
=
true
# Optional unit
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
# Parse arguments
.
$WM_PROJECT_DIR
/wmake/scripts/cmakeFunctions
# The CMake functions
# -----------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
src/runTimePostProcessing/Allwmake
+
3
−
5
View file @
bc703b3e
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
# Source CMake functions
.
$WM_PROJECT_DIR
/wmake/scripts/cmakeFunctions
cd
${
0
%/*
}
||
exit
1
# Run from this directory
.
$WM_PROJECT_DIR
/wmake/scripts/cmakeFunctions
# The CMake functions
# -----------------------------------------------------------------------------
...
...
@@ -23,7 +21,7 @@ if [ -n "$depend" ]
then
if
[
"
$targetType
"
!=
objects
]
then
if
type
cmake
>
/dev/null 2>&1
if
command
-v
cmake
>
/dev/null 2>&1
then
cmakeVersioned
"
$depend
"
$PWD
||
{
echo
...
...
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