Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
catalyst
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Community
catalyst
Commits
6bf21bde
Commit
6bf21bde
authored
Nov 29, 2018
by
Mark Olesen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
STYLE: adjust naming of CMakeLists and comments in Allwmake
parent
a9910934
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
src/catalyst/Allwmake
src/catalyst/Allwmake
+12
-5
src/catalyst/CMakeLists-Project.txt
src/catalyst/CMakeLists-Project.txt
+0
-0
src/catalyst/CMakeLists.txt
src/catalyst/CMakeLists.txt
+1
-1
No files found.
src/catalyst/Allwmake
View file @
6bf21bde
...
...
@@ -3,14 +3,21 @@ cd ${0%/*} || exit 1 # Run from this directory
.
$WM_PROJECT_DIR
/wmake/scripts/cmakeFunctions
# The cmake functions
# 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
cmakeVersionedInstall
()
{
local
depend
=
"
$1
"
local
sourceDir
=
"
$2
"
local
objectsDir
shift
2
local
objectsDir sentinel
# Where generated files are stored
objectsDir
=
$(
findObjectDir
"
$sourceDir
"
)
||
exit
1
# Fatal
...
...
@@ -19,8 +26,8 @@ cmakeVersionedInstall()
sentinel
=
$(
sameDependency
"
$depend
"
"
$sourceDir
"
)
||
\
rm
-rf
"
$objectsDir
"
>
/dev/null 2>&1
mkdir
-p
$objectsDir
\
&&
(
cd
$objectsDir
&&
_cmake
"
$@
"
$sourceDir
&&
make
install
)
\
mkdir
-p
"
$objectsDir
"
\
&&
(
cd
"
$objectsDir
"
&&
_cmake
"
$@
"
"
$sourceDir
"
&&
make
install
)
\
&&
echo
"
$depend
"
>
|
"
${
sentinel
:-
/dev/null
}
"
}
...
...
@@ -52,7 +59,7 @@ then
then
if
command
-v
cmake
>
/dev/null 2>&1
then
cmakeVersionedInstall
"
$depend
"
$PWD
"
$cmakeOpts
"
||
{
cmakeVersionedInstall
"
$depend
"
"
$PWD
"
"
$cmakeOpts
"
||
{
echo
echo
" WARNING: incomplete build of ParaView Catalyst"
echo
...
...
src/catalyst/CMakeLists-
Catalys
t.txt
→
src/catalyst/CMakeLists-
Projec
t.txt
View file @
6bf21bde
File moved
src/catalyst/CMakeLists.txt
View file @
6bf21bde
...
...
@@ -35,6 +35,6 @@ message("================")
#-----------------------------------------------------------------------------
include
(
CMakeLists-
Catalys
t.txt
)
include
(
CMakeLists-
Projec
t.txt
)
#-----------------------------------------------------------------------------
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment