Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
ea452e27
Commit
ea452e27
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
mv Debian settings to where they are used
parent
6dc06ed5
No related branches found
No related tags found
1 merge request
!2464
CMake README, file headers, renaming of some files, and cleanup
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Base/CMakeLists.txt
+1
-0
1 addition, 0 deletions
Base/CMakeLists.txt
cmake/BornAgain/Config.cmake
+0
-12
0 additions, 12 deletions
cmake/BornAgain/Config.cmake
cmake/BornAgain/PackDebian.cmake
+6
-0
6 additions, 0 deletions
cmake/BornAgain/PackDebian.cmake
with
7 additions
and
12 deletions
Base/CMakeLists.txt
+
1
−
0
View file @
ea452e27
...
...
@@ -33,6 +33,7 @@ target_link_libraries(${lib}
target_include_directories
(
${
lib
}
PUBLIC
${
CMAKE_SOURCE_DIR
}
${
BUILD_INC_DIR
}
SYSTEM PUBLIC
${
LibHeinz_INCLUDE_DIR
}
${
Boost_INCLUDE_DIRS
}
...
...
This diff is collapsed.
Click to expand it.
cmake/BornAgain/Config.cmake
+
0
−
12
View file @
ea452e27
...
...
@@ -24,15 +24,3 @@ endif()
configure_file
(
${
CONFIGURABLES_DIR
}
/BAVersion.h.in
${
BUILD_INC_DIR
}
/BAVersion.h @ONLY
)
configure_file
(
${
CONFIGURABLES_DIR
}
/BABuild.h.in
${
BUILD_INC_DIR
}
/BABuild.h @ONLY
)
configure_file
(
${
CONFIGURABLES_DIR
}
/BATesting.h.in
${
BUILD_INC_DIR
}
/BATesting.h @ONLY
)
string
(
APPEND CMAKE_CXX_FLAGS
" -I
${
BUILD_INC_DIR
}
"
)
# -----------------------------------------------------------------------------
# configure postinst and prerm for the debian package
# -----------------------------------------------------------------------------
if
(
BUILD_DEBIAN
)
set
(
CMAKE_INSTALL_PREFIX
"/usr"
)
configure_file
(
${
CONFIGURABLES_DIR
}
/postinst.in
${
BUILD_VAR_DIR
}
/postinst @ONLY
)
configure_file
(
${
CONFIGURABLES_DIR
}
/prerm.in
${
BUILD_VAR_DIR
}
/prerm @ONLY
)
set
(
CMAKE_INSTALL_RPATH \$ORIGIN/../;\$ORIGIN/../../lib/
${
destination_suffix
}
)
endif
()
This diff is collapsed.
Click to expand it.
cmake/BornAgain/PackDebian.cmake
+
6
−
0
View file @
ea452e27
# configure postinst and prerm for the Debian package
CMAKE_INSTALL_PREFIX
"/usr"
)
configure_file
(
${
CONFIGURABLES_DIR
}
/postinst.in
${
BUILD_VAR_DIR
}
/postinst @ONLY
)
configure_file
(
${
CONFIGURABLES_DIR
}
/prerm.in
${
BUILD_VAR_DIR
}
/prerm @ONLY
)
set
(
CMAKE_INSTALL_RPATH \$ORIGIN/../;\$ORIGIN/../../lib/
${
destination_suffix
}
)
# BornAgain debian packaging
set
(
CPACK_GENERATOR DEB
)
...
...
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