Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
8553d603
Commit
8553d603
authored
May 22, 2020
by
Jeremy Cohen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating third party boost to 1.73, force third party zlib on win32
parent
172db761
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
10 deletions
+20
-10
cmake/ThirdPartyBoost.cmake
cmake/ThirdPartyBoost.cmake
+8
-6
cmake/ThirdPartyZlib.cmake
cmake/ThirdPartyZlib.cmake
+12
-4
No files found.
cmake/ThirdPartyBoost.cmake
View file @
8553d603
...
...
@@ -59,7 +59,7 @@ MARK_AS_ADVANCED(Boost_USE_MULTITHREADED)
IF
(
WIN32
)
ADD_DEFINITIONS
(
"-DBOOST_ALL_N
O
_LIB"
)
ADD_DEFINITIONS
(
"-DBOOST_ALL_
DY
N_LIB"
)
ENDIF
()
IF
(
THIRDPARTY_BUILD_BOOST
)
...
...
@@ -123,8 +123,8 @@ IF (THIRDPARTY_BUILD_BOOST)
EXTERNALPROJECT_ADD
(
boost
PREFIX
${
TPSRC
}
URL
${
TPURL
}
/boost_1_
5
7_0.tar.bz2
URL_MD5
"
1be49befbdd9a5ce9def2983ba3e7b76
"
URL
${
TPURL
}
/boost_1_7
3
_0.tar.bz2
URL_MD5
"
9273c8c4576423562bbe84574b07b2bd
"
STAMP_DIR
${
TPBUILD
}
/stamp
DOWNLOAD_DIR
${
TPSRC
}
SOURCE_DIR
${
TPBUILD
}
/boost
...
...
@@ -144,16 +144,18 @@ IF (THIRDPARTY_BUILD_BOOST)
INSTALL_COMMAND
""
)
ELSE
()
IF
(
CMAKE_CL_64
)
MESSAGE
(
STATUS
"Windows MSVC build - toolset is:
${
TOOLSET_CMDLINE
}
"
)
IF
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
SET
(
ADDRESS_MODEL 64
)
ELSE
()
SET
(
ADDRESS_MODEL 32
)
ENDIF
()
MESSAGE
(
STATUS
"Windows MSVC build - address model is:
${
ADDRESS_MODEL
}
"
)
EXTERNALPROJECT_ADD
(
boost
PREFIX
${
TPSRC
}
URL
${
TPURL
}
/boost_1_
5
7_0.tar.bz2
URL_MD5
"
1be49befbdd9a5ce9def2983ba3e7b76
"
URL
URL
${
TPURL
}
/boost_1_7
3
_0.tar.bz2
URL_MD5
"
9273c8c4576423562bbe84574b07b2bd
"
STAMP_DIR
${
TPBUILD
}
/stamp
DOWNLOAD_DIR
${
TPSRC
}
SOURCE_DIR
${
TPBUILD
}
/boost
...
...
cmake/ThirdPartyZlib.cmake
View file @
8553d603
...
...
@@ -8,11 +8,19 @@
# Find a system ZLIB library. If not found enable the THIRDPARTY_BUILD_ZLIB
# option.
FIND_PACKAGE
(
ZLIB QUIET
)
IF
(
ZLIB_FOUND AND NOT ZLIB_VERSION_PATCH LESS 7
)
SET
(
BUILD_ZLIB OFF
)
ELSE
()
# On Windows, we want to force the use of third party zlib
# since this will be used with the boost build if boost is being
# built as a third party lib
IF
(
WIN32
)
MESSAGE
(
STATUS
"On a WIN32 platform, zlib will be built as a third party library..."
)
SET
(
BUILD_ZLIB ON
)
ELSE
()
FIND_PACKAGE
(
ZLIB QUIET
)
IF
(
ZLIB_FOUND AND NOT ZLIB_VERSION_PATCH LESS 7
)
SET
(
BUILD_ZLIB OFF
)
ELSE
()
SET
(
BUILD_ZLIB ON
)
ENDIF
()
ENDIF
()
OPTION
(
THIRDPARTY_BUILD_ZLIB
"Build ZLib library"
${
BUILD_ZLIB
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment