Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
catalyst
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
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
Community
catalyst
Commits
6bf21bde
Commit
6bf21bde
authored
6 years ago
by
Mark OLESEN
Browse files
Options
Downloads
Patches
Plain Diff
STYLE: adjust naming of CMakeLists and comments in Allwmake
parent
a9910934
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/catalyst/Allwmake
+12
-5
12 additions, 5 deletions
src/catalyst/Allwmake
src/catalyst/CMakeLists-Project.txt
+0
-0
0 additions, 0 deletions
src/catalyst/CMakeLists-Project.txt
src/catalyst/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/catalyst/CMakeLists.txt
with
13 additions
and
6 deletions
src/catalyst/Allwmake
+
12
−
5
View file @
6bf21bde
...
@@ -3,14 +3,21 @@ cd ${0%/*} || exit 1 # Run from this directory
...
@@ -3,14 +3,21 @@ cd ${0%/*} || exit 1 # Run from this directory
.
$WM_PROJECT_DIR
/wmake/scripts/cmakeFunctions
# The cmake functions
.
$WM_PROJECT_DIR
/wmake/scripts/cmakeFunctions
# The cmake functions
# CMake into objectsDir with external dependency
# CMake into objectsDir with external dependency
# - Can this function can be removed with OpenFOAM-1812 ?
#
# 1 - depend
# 2 - sourceDir
# 3... optional cmake defines
#
# Available directly in OpenFOAM-1812 but left here for a while
# to ensure we can build with slightly older versions too (2018-11-29)
#
unset
-f
cmakeVersionedInstall 2>/dev/null
unset
-f
cmakeVersionedInstall 2>/dev/null
cmakeVersionedInstall
()
cmakeVersionedInstall
()
{
{
local
depend
=
"
$1
"
local
depend
=
"
$1
"
local
sourceDir
=
"
$2
"
local
sourceDir
=
"
$2
"
local
objectsDir
shift
2
shift
2
local
objectsDir sentinel
# Where generated files are stored
# Where generated files are stored
objectsDir
=
$(
findObjectDir
"
$sourceDir
"
)
||
exit
1
# Fatal
objectsDir
=
$(
findObjectDir
"
$sourceDir
"
)
||
exit
1
# Fatal
...
@@ -19,8 +26,8 @@ cmakeVersionedInstall()
...
@@ -19,8 +26,8 @@ cmakeVersionedInstall()
sentinel
=
$(
sameDependency
"
$depend
"
"
$sourceDir
"
)
||
\
sentinel
=
$(
sameDependency
"
$depend
"
"
$sourceDir
"
)
||
\
rm
-rf
"
$objectsDir
"
>
/dev/null 2>&1
rm
-rf
"
$objectsDir
"
>
/dev/null 2>&1
mkdir
-p
$objectsDir
\
mkdir
-p
"
$objectsDir
"
\
&&
(
cd
$objectsDir
&&
_cmake
"
$@
"
$sourceDir
&&
make
install
)
\
&&
(
cd
"
$objectsDir
"
&&
_cmake
"
$@
"
"
$sourceDir
"
&&
make
install
)
\
&&
echo
"
$depend
"
>
|
"
${
sentinel
:-
/dev/null
}
"
&&
echo
"
$depend
"
>
|
"
${
sentinel
:-
/dev/null
}
"
}
}
...
@@ -52,7 +59,7 @@ then
...
@@ -52,7 +59,7 @@ then
then
then
if
command
-v
cmake
>
/dev/null 2>&1
if
command
-v
cmake
>
/dev/null 2>&1
then
then
cmakeVersionedInstall
"
$depend
"
$PWD
"
$cmakeOpts
"
||
{
cmakeVersionedInstall
"
$depend
"
"
$PWD
"
"
$cmakeOpts
"
||
{
echo
echo
echo
" WARNING: incomplete build of ParaView Catalyst"
echo
" WARNING: incomplete build of ParaView Catalyst"
echo
echo
...
...
This diff is collapsed.
Click to expand it.
src/catalyst/CMakeLists-
Catalys
t.txt
→
src/catalyst/CMakeLists-
Projec
t.txt
+
0
−
0
View file @
6bf21bde
File moved
This diff is collapsed.
Click to expand it.
src/catalyst/CMakeLists.txt
+
1
−
1
View file @
6bf21bde
...
@@ -35,6 +35,6 @@ message("================")
...
@@ -35,6 +35,6 @@ message("================")
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
include
(
CMakeLists-
Catalys
t.txt
)
include
(
CMakeLists-
Projec
t.txt
)
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
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