Commit 419bd2cb authored by Guillaume Pasero's avatar Guillaume Pasero

STYLE: clean SuperBuild code

parent be1acc94
......@@ -33,8 +33,6 @@ else()
if(SUPERBUILD_BOOST_HEADER_ONLY)
ExternalProject_Add(${proj}
PREFIX ${proj}
#URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz/download"
#URL_MD5 efbfbff5a85a9330951f243d0a46e4b9
URL "http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
URL_MD5 52dd00be775e689f55a987baebccc462
BINARY_DIR ${BOOST_SB_BUILD_DIR}
......@@ -51,8 +49,6 @@ else()
else()
ExternalProject_Add(${proj}
PREFIX ${proj}
#URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz/download"
#URL_MD5 efbfbff5a85a9330951f243d0a46e4b9
URL "http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
URL_MD5 52dd00be775e689f55a987baebccc462
BINARY_DIR ${BOOST_SB_BUILD_DIR}
......
......@@ -16,8 +16,6 @@ else()
if(WIN32)
ExternalProject_Add(${proj}
PREFIX ${proj}
#URL "http://www.ijg.org/files/jpegsr8c.zip"
#URL_MD5 2af71a567af8f60a649b2fcc87c88192
URL "http://www.ijg.org/files/jpegsrc.v9a.tar.gz"
URL_MD5 3353992aecaee1805ef4109aadd433e7
SOURCE_DIR ${JPEG_SB_SRC}
......
......@@ -14,48 +14,21 @@ else()
SETUP_SUPERBUILD(PROJECT ${proj})
message(STATUS " Using SQLite SuperBuild version")
#if(UNIX)
if(0)
ExternalProject_Add(${proj}
PREFIX ${proj}
URL "https://sqlite.org/2014/sqlite-autoconf-3080702.tar.gz"
URL_MD5 0f847048745ddbdf0c441c82d096fbb4
BINARY_DIR ${SQLITE_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND ${SQLITE_SB_BUILD_DIR}/configure
--prefix=${SB_INSTALL_PREFIX}
--enable-static=no
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
DEPENDS ${${proj}_DEPENDENCIES}
)
ExternalProject_Add_Step(${proj} copy_source
COMMAND ${CMAKE_COMMAND} -E copy_directory
${SQLITE_SB_SRC} ${SQLITE_SB_BUILD_DIR}
DEPENDEES patch update
DEPENDERS configure
)
#else(MSVC)
else()
ExternalProject_Add(${proj}
PREFIX ${proj}
URL "http://www.sqlite.org/2015/sqlite-amalgamation-3080801.zip"
URL_MD5 b1cbcbd710bdfd762dc169f1676053b5
SOURCE_DIR ${SQLITE_SB_SRC}
BINARY_DIR ${SQLITE_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/${proj} ${SQLITE_SB_SRC}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE:STRING=Release
-DBUILD_SHARED_LIBS:BOOL=ON
CMAKE_COMMAND
)
endif()
ExternalProject_Add(${proj}
PREFIX ${proj}
URL "http://www.sqlite.org/2015/sqlite-amalgamation-3080801.zip"
URL_MD5 b1cbcbd710bdfd762dc169f1676053b5
SOURCE_DIR ${SQLITE_SB_SRC}
BINARY_DIR ${SQLITE_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/${proj} ${SQLITE_SB_SRC}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE:STRING=Release
-DBUILD_SHARED_LIBS:BOOL=ON
CMAKE_COMMAND
)
set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment