deps: Remove libpng
This commit is contained in:
parent
e927c65c0a
commit
8e2ec38670
4 changed files with 1 additions and 71 deletions
12
deps/deps-linux.cmake
vendored
12
deps/deps-linux.cmake
vendored
|
@ -24,18 +24,6 @@ ExternalProject_Add(dep_boost
|
|||
INSTALL_COMMAND "" # b2 does that already
|
||||
)
|
||||
|
||||
# ExternalProject_Add(dep_libpng
|
||||
# EXCLUDE_FROM_ALL 1
|
||||
# URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz"
|
||||
# URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f
|
||||
# CMAKE_ARGS
|
||||
# -DPNG_SHARED=OFF
|
||||
# -DPNG_TESTS=OFF
|
||||
# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
||||
# ${DEP_CMAKE_OPTS}
|
||||
# # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
|
||||
# )
|
||||
|
||||
ExternalProject_Add(dep_libopenssl
|
||||
EXCLUDE_FROM_ALL 1
|
||||
URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz"
|
||||
|
|
14
deps/deps-macos.cmake
vendored
14
deps/deps-macos.cmake
vendored
|
@ -87,20 +87,6 @@ ExternalProject_Add(dep_libcurl
|
|||
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
|
||||
)
|
||||
|
||||
ExternalProject_Add(dep_libpng
|
||||
EXCLUDE_FROM_ALL 1
|
||||
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
|
||||
${DEP_CMAKE_OPTS}
|
||||
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
|
||||
INSTALL_COMMAND ""
|
||||
)
|
||||
|
||||
|
||||
ExternalProject_Add(dep_wxwidgets
|
||||
EXCLUDE_FROM_ALL 1
|
||||
URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2"
|
||||
|
|
4
deps/deps-unix-common.cmake
vendored
4
deps/deps-unix-common.cmake
vendored
|
@ -10,7 +10,6 @@ ExternalProject_Add(dep_tbb
|
|||
-DTBB_BUILD_TESTS=OFF
|
||||
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
||||
${DEP_CMAKE_OPTS}
|
||||
# INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
|
||||
)
|
||||
|
||||
ExternalProject_Add(dep_gtest
|
||||
|
@ -18,7 +17,6 @@ ExternalProject_Add(dep_gtest
|
|||
URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz"
|
||||
URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
|
||||
CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
||||
# INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
|
||||
)
|
||||
|
||||
ExternalProject_Add(dep_nlopt
|
||||
|
@ -33,6 +31,4 @@ ExternalProject_Add(dep_nlopt
|
|||
-DNLOPT_GUILE=OFF
|
||||
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
|
||||
${DEP_CMAKE_OPTS}
|
||||
# INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
|
||||
# INSTALL_COMMAND ""
|
||||
)
|
||||
|
|
40
deps/deps-windows.cmake
vendored
40
deps/deps-windows.cmake
vendored
|
@ -165,46 +165,6 @@ if (${DEP_DEBUG})
|
|||
endif ()
|
||||
|
||||
|
||||
ExternalProject_Add(dep_libpng
|
||||
DEPENDS dep_zlib
|
||||
EXCLUDE_FROM_ALL 1
|
||||
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
|
||||
INSTALL_COMMAND ""
|
||||
)
|
||||
if (${DEP_DEBUG})
|
||||
ExternalProject_Get_Property(dep_libpng BINARY_DIR)
|
||||
ExternalProject_Add_Step(dep_libpng build_debug
|
||||
DEPENDEES build
|
||||
DEPENDERS install
|
||||
COMMAND msbuild /P:Configuration=Debug INSTALL.vcxproj
|
||||
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)
|
||||
set(DEP_LIBCURL_TARGET "x86")
|
||||
else ()
|
||||
|
|
Loading…
Reference in a new issue