Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LAM Actuator Server Config
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
MSK-SW
Laser-based Synchronisation
Laser Pulse Arrival Time Monitor
LAM Actuator Server Config
Commits
32b422c3
Commit
32b422c3
authored
3 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of github.com:ChimeraTK/project-template
parents
87781a23
8ff72125
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/config_generator_project.cmake
+1
-1
1 addition, 1 deletion
cmake/config_generator_project.cmake
cmake/enable_doxygen_documentation.cmake
+1
-1
1 addition, 1 deletion
cmake/enable_doxygen_documentation.cmake
with
2 additions
and
2 deletions
cmake/config_generator_project.cmake
+
1
−
1
View file @
32b422c3
...
...
@@ -38,7 +38,7 @@ endforeach()
# copy all server type directories to the build directory
foreach
(
servertype
${
servertypes
}
)
file
(
GLOB_RECURSE files RELATIVE
${
PROJECT_SOURCE_DIR
}
${
servertype
}
/*
)
file
(
GLOB_RECURSE files
FOLLOW_SYMLINKS
RELATIVE
${
PROJECT_SOURCE_DIR
}
${
servertype
}
/*
)
foreach
(
f
${
files
}
)
configure_file
(
"
${
f
}
"
"
${
PROJECT_BINARY_DIR
}
/
${
f
}
"
COPYONLY
)
endforeach
()
...
...
This diff is collapsed.
Click to expand it.
cmake/enable_doxygen_documentation.cmake
+
1
−
1
View file @
32b422c3
...
...
@@ -43,7 +43,7 @@ if(DOXYGEN_FOUND)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/Doxyfile.in
${
CMAKE_CURRENT_BINARY_DIR
}
/Doxyfile @ONLY
)
add_custom_target
(
doc
${
DOC_DEPENDENCY
}
${
DOXYGEN_EXECUTABLE
}
${
CMAKE_CURRENT_BINARY_DIR
}
/Doxyfile
COMMAND
${
CMAKE_COMMAND
}
-E env GS_OPTIONS=-dNOSAFER
${
DOXYGEN_EXECUTABLE
}
${
CMAKE_CURRENT_BINARY_DIR
}
/Doxyfile
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
#note the / after ${CMAKE_BINARY_DIR}/doc/. This causes the directory to be renamed to the destination, not copied into
...
...
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