Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review 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
mantidproject
mantid
Commits
e6ee4365
Commit
e6ee4365
authored
7 years ago
by
Simon Heybrock
Browse files
Options
Downloads
Patches
Plain Diff
Re #0. Update for getting boost-serialization on Windows.
parent
f92bc3af
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
buildconfig/CMake/Bootstrap.cmake
+1
-1
1 addition, 1 deletion
buildconfig/CMake/Bootstrap.cmake
buildconfig/CMake/WindowsNSIS.cmake
+1
-0
1 addition, 0 deletions
buildconfig/CMake/WindowsNSIS.cmake
with
2 additions
and
1 deletion
buildconfig/CMake/Bootstrap.cmake
+
1
−
1
View file @
e6ee4365
...
@@ -10,7 +10,7 @@ if( MSVC )
...
@@ -10,7 +10,7 @@ if( MSVC )
include
(
ExternalProject
)
include
(
ExternalProject
)
set
(
EXTERNAL_ROOT
${
PROJECT_SOURCE_DIR
}
/external
)
set
(
EXTERNAL_ROOT
${
PROJECT_SOURCE_DIR
}
/external
)
set
(
THIRD_PARTY_GIT_URL
"https://github.com/mantidproject/thirdparty-msvc2015.git"
)
set
(
THIRD_PARTY_GIT_URL
"https://github.com/mantidproject/thirdparty-msvc2015.git"
)
set
(
THIRD_PARTY_GIT_SHA1
87a8fa24f066725494454c4ff10bcc21088b316a
)
set
(
THIRD_PARTY_GIT_SHA1
00a89211af3e581e99a42a2686bb94ead3b45463
)
set
(
THIRD_PARTY_DIR
${
EXTERNAL_ROOT
}
/src/ThirdParty
)
set
(
THIRD_PARTY_DIR
${
EXTERNAL_ROOT
}
/src/ThirdParty
)
# Generates a script to do the clone/update in tmp
# Generates a script to do the clone/update in tmp
set
(
_project_name ThirdParty
)
set
(
_project_name ThirdParty
)
...
...
This diff is collapsed.
Click to expand it.
buildconfig/CMake/WindowsNSIS.cmake
+
1
−
0
View file @
e6ee4365
...
@@ -45,6 +45,7 @@ set ( BOOST_DIST_DLLS
...
@@ -45,6 +45,7 @@ set ( BOOST_DIST_DLLS
boost_date_time-mt.dll
boost_date_time-mt.dll
boost_python-mt.dll
boost_python-mt.dll
boost_regex-mt.dll
boost_regex-mt.dll
boost_serialization-mt.dll
)
)
set
(
POCO_DIST_DLLS
set
(
POCO_DIST_DLLS
PocoCrypto64.dll
PocoCrypto64.dll
...
...
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