diff options
Diffstat (limited to 'deps/deps-windows.cmake')
| -rw-r--r-- | deps/deps-windows.cmake | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index d49434ecb..44a1843bb 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -15,8 +15,8 @@ endif () ExternalProject_Add(dep_boost EXCLUDE_FROM_ALL 1 - URL "https://dl.bintray.com/boostorg/release/1.63.0/source/boost_1_63_0.tar.gz" - URL_HASH SHA256=fe34a4e119798e10b8cc9e565b3b0284e9fd3977ec8a1b19586ad1dec397088b + URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz" + URL_HASH SHA256=bd0df411efd9a585e5a2212275f8762079fed8842264954675a4fddc46cfcf60 BUILD_IN_SOURCE 1 CONFIGURE_COMMAND bootstrap.bat BUILD_COMMAND b2.exe @@ -121,7 +121,8 @@ ExternalProject_Add(dep_zlib URL_HASH SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_ARGS - "-DINSTALL_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}\\fallout" # I found no better way of preventing zlib creating & installing DLLs :-/ + -DSKIP_INSTALL_FILES=ON # Prevent installation of man pages et al. + "-DINSTALL_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}\\fallout" # I found no better way of preventing zlib from creating & installing DLLs :-/ -DCMAKE_POSITION_INDEPENDENT_CODE=ON "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local" BUILD_COMMAND msbuild /P:Configuration=Release INSTALL.vcxproj @@ -136,17 +137,31 @@ if (${DEP_DEBUG}) WORKING_DIRECTORY "${BINARY_DIR}" ) endif () +# The following steps are unfortunately needed to remove the _static suffix on libraries +ExternalProject_Add_Step(dep_zlib fix_static + DEPENDEES install + COMMAND "${CMAKE_COMMAND}" -E rename zlibstatic.lib zlib.lib + WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" +) +if (${DEP_DEBUG}) + ExternalProject_Add_Step(dep_zlib fix_static_debug + DEPENDEES install + COMMAND "${CMAKE_COMMAND}" -E rename zlibstaticd.lib zlibd.lib + WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" + ) +endif () ExternalProject_Add(dep_libpng DEPENDS dep_zlib EXCLUDE_FROM_ALL 1 - URL "http://prdownloads.sourceforge.net/libpng/libpng-1.6.35.tar.xz?download" - URL_HASH SHA256=23912ec8c9584917ed9b09c5023465d71709dce089be503c7867fec68a93bcd7 + URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz" + URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_ARGS -DPNG_SHARED=OFF -DPNG_TESTS=OFF + -DSKIP_INSTALL_FILES=ON # Prevent installation of man pages et al. -DCMAKE_POSITION_INDEPENDENT_CODE=ON "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local" BUILD_COMMAND msbuild /P:Configuration=Release INSTALL.vcxproj @@ -161,6 +176,20 @@ if (${DEP_DEBUG}) WORKING_DIRECTORY "${BINARY_DIR}" ) endif () +# The following steps are unfortunately needed to remove the _static suffix on libraries +# (And also overwrite the dynamic .lib) +ExternalProject_Add_Step(dep_libpng fix_static + DEPENDEES install + COMMAND "${CMAKE_COMMAND}" -E rename libpng16_static.lib libpng16.lib + WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" +) +if (${DEP_DEBUG}) + ExternalProject_Add_Step(dep_libpng fix_static_debug + DEPENDEES install + COMMAND "${CMAKE_COMMAND}" -E rename libpng16_staticd.lib libpng16d.lib + WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\" + ) +endif () if (${DEPS_BITS} EQUAL 32) |