From 48378bd9ad356fb866b76dfb4bc8d09d9c84fdbb Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Thu, 2 Jul 2015 13:20:35 +0200
Subject: [PATCH] SuperBuild: remove unused static libs generated in install
tree
---
SuperBuild/CMake/External_geos.cmake | 8 ++++++--
SuperBuild/CMake/External_jpeg.cmake | 9 ++++++---
SuperBuild/CMake/External_openssl.cmake | 12 ++++++++++--
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/SuperBuild/CMake/External_geos.cmake b/SuperBuild/CMake/External_geos.cmake
index 1a45504cc8..4eb32534e7 100644
--- a/SuperBuild/CMake/External_geos.cmake
+++ b/SuperBuild/CMake/External_geos.cmake
@@ -28,8 +28,12 @@ else()
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
-DGEOS_ENABLE_TESTS:BOOL=OFF
- CMAKE_COMMAND ${SB_CMAKE_COMMAND}
- )
+ CMAKE_COMMAND ${SB_CMAKE_COMMAND} )
+
+ ExternalProject_Add_Step(${proj} remove_static
+ COMMAND ${CMAKE_COMMAND} -E remove
+ ${SB_INSTALL_PREFIX}/lib/libgeos.a
+ DEPENDEES install)
set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
diff --git a/SuperBuild/CMake/External_jpeg.cmake b/SuperBuild/CMake/External_jpeg.cmake
index 1b2e6ce2ea..615c4b55d9 100644
--- a/SuperBuild/CMake/External_jpeg.cmake
+++ b/SuperBuild/CMake/External_jpeg.cmake
@@ -49,8 +49,8 @@ else()
${JPEG_SB_BUILD_DIR}/configure
--prefix=${SB_INSTALL_PREFIX}
--enable-shared=yes
- BUILD_COMMAND $(MAKE)
- INSTALL_COMMAND $(MAKE) install
+ BUILD_COMMAND $(MAKE) bin_PROGRAMS=
+ INSTALL_COMMAND $(MAKE) install bin_PROGRAMS=
DEPENDS ${${proj}_DEPENDENCIES}
)
@@ -60,7 +60,10 @@ else()
DEPENDEES patch update
DEPENDERS configure
)
-
+
+ ExternalProject_Add_Step(${proj} remove_static
+ COMMAND ${CMAKE_COMMAND} -E remove ${SB_INSTALL_PREFIX}/lib/libjpeg.a
+ DEPENDEES install)
endif()
set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
diff --git a/SuperBuild/CMake/External_openssl.cmake b/SuperBuild/CMake/External_openssl.cmake
index de70bcdc18..145d532cb0 100644
--- a/SuperBuild/CMake/External_openssl.cmake
+++ b/SuperBuild/CMake/External_openssl.cmake
@@ -58,8 +58,16 @@ else()
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E chdir ${OPENSSL_SB_BUILD_DIR} ./config ${OPENSSL_BUILD_ARCH}
--prefix=${SB_INSTALL_PREFIX} shared zlib zlib-dynamic -I${SB_INSTALL_PREFIX}/include -L${SB_INSTALL_PREFIX}/lib
BUILD_COMMAND $(MAKE)
- INSTALL_COMMAND $(MAKE) install
- )
+ INSTALL_COMMAND $(MAKE) install)
+
+ ExternalProject_Add_Step(${proj} remove_static
+ COMMAND ${CMAKE_COMMAND} -E remove
+ ${SB_INSTALL_PREFIX}/lib/libssl.a
+ ${SB_INSTALL_PREFIX}/lib/libcrypto.a
+ ${SB_INSTALL_PREFIX}/bin/openssl
+ ${SB_INSTALL_PREFIX}/bin/c_rehash
+ DEPENDEES install)
+
endif()
set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
--
GitLab