Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Core Modules
dune-common
Commits
969de5aa
Commit
969de5aa
authored
13 years ago
by
Markus Blatt
Browse files
Options
Downloads
Patches
Plain Diff
Update install_manifest.txt to include files installed during
subprocess cmak call. [[Imported from SVN: r6650]]
parent
61efe77b
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
cmake/modules/DUNEDoc.cmake
+5
-3
5 additions, 3 deletions
cmake/modules/DUNEDoc.cmake
cmake/modules/DUNEDoxygen.cmake
+6
-1
6 additions, 1 deletion
cmake/modules/DUNEDoxygen.cmake
with
11 additions
and
4 deletions
cmake/modules/DUNEDoc.cmake
+
5
−
3
View file @
969de5aa
...
...
@@ -5,13 +5,15 @@
#
add_custom_target
(
doc
)
MACRO
(
create_doc_install filename targetdir
)
get_filename_component
(
targetfile
${
filename
}
NAME
)
set
(
install_command
${
CMAKE_COMMAND
}
-D FILE=
${
filename
}
-D DIR=
${
CMAKE_INSTALL_PREFIX
}
/
${
targetdir
}
-P
${
CMAKE_SOURCE_DIR
}
/cmake/scripts/InstallFile.cmake
)
set
(
install_command
${
CMAKE_COMMAND
}
-D FILE
S
=
${
filename
}
-D DIR=
${
CMAKE_INSTALL_PREFIX
}
/
${
targetdir
}
-P
${
CMAKE_SOURCE_DIR
}
/cmake/scripts/InstallFile.cmake
)
# create a custom target for the installation
add_custom_target
(
install_
${
targetfile
}
${
install_command
}
COMMENT
"Installing
${
filename
}
to
${
targetdir
}
"
DEPENDS
${
filename
}
)
# When installing call cmake install with the above install target
install
(
CODE
"execute_process(COMMAND
\"
${
CMAKE_COMMAND
}
\"
--build
\"
${
CMAKE_BINARY_DIR
}
\"
--target install_
${
targetfile
}
)"
)
# When installing, call cmake install with the above install target and add the file to install_manifest.txt
install
(
CODE
"execute_process(COMMAND
\"
${
CMAKE_COMMAND
}
\"
--build
\"
${
CMAKE_BINARY_DIR
}
\"
--target install_
${
targetfile
}
)
LIST(APPEND CMAKE_INSTALL_MANIFEST_FILES
${
CMAKE_INSTALL_PREFIX
}
/
${
targetdir
}
/
${
targetfile
}
)"
)
ENDMACRO
(
create_doc_install
)
This diff is collapsed.
Click to expand it.
cmake/modules/DUNEDoxygen.cmake
+
6
−
1
View file @
969de5aa
...
...
@@ -51,6 +51,11 @@ MACRO (add_doxygen_target)
DEPENDS doxygen_
${
DUNE_MOD_NAME
}
)
# When installing call cmake install with the above install target
install
(
CODE
"execute_process(COMMAND
\"
${
CMAKE_COMMAND
}
\"
--build
\"
${
CMAKE_BINARY_DIR
}
\"
--target doxygen_install_
${
DUNE_MOD_NAME
}
)"
)
install
(
CODE
"execute_process(COMMAND
\"
${
CMAKE_COMMAND
}
\"
--build
\"
${
CMAKE_BINARY_DIR
}
\"
--target doxygen_install_
${
DUNE_MOD_NAME
}
)
foreach(_file
${
doxygenfiles
}
)
get_filename_component(_basename
\$
{_file} NAME)
LIST(APPEND CMAKE_INSTALL_MANIFEST_FILES
\$
{CMAKE_INSTALL_PREFIX}/share/doc/
${
DUNE_MOD_NAME
}
/doxygen/
\$
{_basename})
endforeach(_file in
\$
{doxygenfiles})"
)
endif
(
DOXYGEN_FOUND
)
ENDMACRO
(
add_doxygen_target
)
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