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
e38eadb1
Commit
e38eadb1
authored
6 years ago
by
Yurov, Dmitry
Browse files
Options
Downloads
Patches
Plain Diff
Removed boost date-time library from the dependencies
Redmine: #2110
parent
eeca20d6
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/bornagain/modules/CPackDebian.cmake
+1
-1
1 addition, 1 deletion
cmake/bornagain/modules/CPackDebian.cmake
cmake/bornagain/modules/SearchInstalledSoftware.cmake
+1
-1
1 addition, 1 deletion
cmake/bornagain/modules/SearchInstalledSoftware.cmake
with
2 additions
and
2 deletions
cmake/bornagain/modules/CPackDebian.cmake
+
1
−
1
View file @
e38eadb1
...
@@ -24,7 +24,7 @@ set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
...
@@ -24,7 +24,7 @@ set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
set
(
CPACK_DEBIAN_PACKAGE_PRIORITY
"optional"
)
set
(
CPACK_DEBIAN_PACKAGE_PRIORITY
"optional"
)
set
(
CPACK_DEBIAN_PACKAGE_SECTION
"devel"
)
set
(
CPACK_DEBIAN_PACKAGE_SECTION
"devel"
)
set
(
CPACK_STRIP_FILES
"TRUE"
)
set
(
CPACK_STRIP_FILES
"TRUE"
)
set
(
CPACK_DEBIAN_PACKAGE_DEPENDS
"libgsl2,
libboost-date-time
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
,
libboost-chrono
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-python
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-program-options
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-iostreams
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-filesystem
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-thread
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libfftw3-3(>=3.3.1), python(>=2.7), libpython2.7, python-numpy, python-matplotlib, libc6(>= 2.7), libqt5widgets5(>=5.1.0), libtiffxx5(>=4.0.2)"
)
set
(
CPACK_DEBIAN_PACKAGE_DEPENDS
"libgsl2, libboost-chrono
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-python
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-program-options
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-iostreams
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-filesystem
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libboost-thread
${
Boost_MAJOR_VERSION
}
.
${
Boost_MINOR_VERSION
}
.
${
Boost_SUBMINOR_VERSION
}
, libfftw3-3(>=3.3.1), python(>=2.7), libpython2.7, python-numpy, python-matplotlib, libc6(>= 2.7), libqt5widgets5(>=5.1.0), libtiffxx5(>=4.0.2)"
)
set
(
CPACK_DEBIAN_PACKAGE_DESCRIPTION
"
${
CPACK_PACKAGE_DESCRIPTION
}
"
)
set
(
CPACK_DEBIAN_PACKAGE_DESCRIPTION
"
${
CPACK_PACKAGE_DESCRIPTION
}
"
)
set
(
CPACK_DEBIAN_PACKAGE_VERSION
${
BornAgain_VERSION_PATCH
}
)
set
(
CPACK_DEBIAN_PACKAGE_VERSION
${
BornAgain_VERSION_PATCH
}
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
CPACK_DEBIAN_PACKAGE_NAME
}
-
${
CPACK_PACKAGE_VERSION_MAJOR
}
.
${
CPACK_PACKAGE_VERSION_MINOR
}
-
${
CPACK_DEBIAN_PACKAGE_VERSION
}
_
${
CPACK_DEBIAN_PACKAGE_ARCHITECTURE
}
"
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
CPACK_DEBIAN_PACKAGE_NAME
}
-
${
CPACK_PACKAGE_VERSION_MAJOR
}
.
${
CPACK_PACKAGE_VERSION_MINOR
}
-
${
CPACK_DEBIAN_PACKAGE_VERSION
}
_
${
CPACK_DEBIAN_PACKAGE_ARCHITECTURE
}
"
)
...
...
This diff is collapsed.
Click to expand it.
cmake/bornagain/modules/SearchInstalledSoftware.cmake
+
1
−
1
View file @
e38eadb1
...
@@ -18,7 +18,7 @@ set(Boost_USE_MULTITHREADED ON)
...
@@ -18,7 +18,7 @@ set(Boost_USE_MULTITHREADED ON)
set
(
Boost_USE_STATIC_RUNTIME OFF
)
set
(
Boost_USE_STATIC_RUNTIME OFF
)
add_definitions
(
-DBOOST_ALL_DYN_LINK
)
# line is needed for MSVC
add_definitions
(
-DBOOST_ALL_DYN_LINK
)
# line is needed for MSVC
#add_definitions(-DBOOST_LIB_DIAGNOSTIC) # shows during compilation auto-linked libraries
#add_definitions(-DBOOST_LIB_DIAGNOSTIC) # shows during compilation auto-linked libraries
set
(
boost_libraries_required
date_time
chrono program_options iostreams system filesystem
)
set
(
boost_libraries_required chrono program_options iostreams system filesystem
)
if
(
WIN32
)
if
(
WIN32
)
set
(
boost_libraries_required
${
boost_libraries_required
}
zlib bzip2
)
set
(
boost_libraries_required
${
boost_libraries_required
}
zlib bzip2
)
endif
()
endif
()
...
...
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
