Skip to content
Snippets Groups Projects
Commit 797d33f5 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

remove FreeType: adding freetype is not enough for Qt4 fontconfig support. disabling its option too

parent a48e7962
No related branches found
No related tags found
No related merge requests found
set(proj FREETYPE)
if(NOT __EXTERNAL_${proj}__)
set(__EXTERNAL_${proj}__ 1)
message(STATUS "Setup freetype ...")
if(USE_SYSTEM_FREETYPE)
find_package ( FreeType )
message(STATUS " Using FreeType system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
message(STATUS " Using FreeType SuperBuild version")
ExternalProject_Add(${proj}
PREFIX ${proj}
URL "http://download.savannah.gnu.org/releases/freetype/freetype-2.6.tar.gz"
URL_MD5 1d733ea6c1b7b3df38169fbdbec47d2b
BINARY_DIR ${FREETYPE_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE:STRING=Release
-DBUILD_SHARED_LIBS:BOOL=ON
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
)
set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/freetype.lib)
elseif(UNIX)
set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libfreetype${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
endif()
endif()
......@@ -17,14 +17,14 @@ if(USE_SYSTEM_OSSIM)
else()
SETUP_SUPERBUILD(PROJECT ${proj})
message(STATUS " Using OSSIM SuperBuild version")
# declare dependencies
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} TIFF GEOTIFF GEOS JPEG OPENTHREADS FREETYPE)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} TIFF GEOTIFF GEOS JPEG OPENTHREADS)
INCLUDE_SUPERBUILD_DEPENDENCIES(${${proj}_DEPENDENCIES})
# set proj back to its original value
set(proj OSSIM)
ADD_SUPERBUILD_CMAKE_VAR(TIFF_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(TIFF_LIBRARY)
ADD_SUPERBUILD_CMAKE_VAR(GEOTIFF_INCLUDE_DIR)
......@@ -35,15 +35,13 @@ else()
ADD_SUPERBUILD_CMAKE_VAR(JPEG_LIBRARY)
ADD_SUPERBUILD_CMAKE_VAR(OPENTHREADS_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(OPENTHREADS_LIBRARY)
ADD_SUPERBUILD_CMAKE_VAR(FREETYPE_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(FREETYPE_LIBRARY)
set(OSSIM_CXX_FLAGS -D__STDC_CONSTANT_MACROS)
if(MSVC)
set(OSSIM_CXX_FLAGS /EHsc)
endif()
if(0)
# SVN version
ExternalProject_Add(ossim_cmakemodules
......@@ -56,9 +54,9 @@ else()
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/patches/${proj}/OssimUtilities.cmake
${CMAKE_BINARY_DIR}/${proj}/_cmakemodules/src/ossim_cmakemodules)
list(APPEND ${proj}_DEPENDENCIES ossim_cmakemodules)
ExternalProject_Add(${proj}
PREFIX ${proj}
SVN_REPOSITORY "http://svn.osgeo.org/ossim/trunk/ossim/"
......@@ -74,6 +72,7 @@ else()
-DBUILD_OSSIM_MPI_SUPPORT:BOOL=OFF
-DBUILD_OSSIM_APPS:BOOL=OFF
-DBUILD_OSSIM_FRAMEWORKS:BOOL=OFF
-DBUILD_OSSIM_FREETYPE_SUPPORT:BOOL=OFF
-DINSTALL_ARCHIVE_DIR:STRING=lib
-DINSTALL_LIBRARY_DIR:STRING=lib
-DCMAKE_PREFIX_PATH:STRING=${SB_INSTALL_PREFIX};${CMAKE_PREFIX_PATH}
......@@ -81,7 +80,7 @@ else()
DEPENDS ${${proj}_DEPENDENCIES}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
)
ExternalProject_Add_Step(${proj} copy_CMakeModules
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_BINARY_DIR}/${proj}/_cmakemodules/src/ossim_cmakemodules ${OSSIM_SB_SRC}/CMakeModules
......@@ -104,7 +103,7 @@ else()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_CXX_FLAGS:STRING=${OSSIM_CXX_FLAGS}
-DBUILD_OSSIM_MPI_SUPPORT:BOOL=OFF
-DBUILD_OSSIM_FREETYPE_SUPPORT:BOOL=ON
-DBUILD_OSSIM_FREETYPE_SUPPORT:BOOL=OFF
-DBUILD_OSSIM_APPS:BOOL=OFF
-DBUILD_OSSIM_FRAMEWORKS:BOOL=OFF
-DINSTALL_ARCHIVE_DIR:STRING=lib
......@@ -118,14 +117,14 @@ else()
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
)
endif()
set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/ossim.lib)
elseif(UNIX)
set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libossim${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
endif()
endif()
......@@ -14,29 +14,29 @@ else()
if(UNIX)
message(STATUS " SuperBuild may fail to compile Qt4. If so, you should install it via package manager.")
endif()
if(NOT DEFINED git_protocol)
set(git_protocol "git")
endif()
# declare dependencies
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} ZLIB TIFF PNG SQLITE FREETYPE)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} ZLIB TIFF PNG SQLITE)
INCLUDE_SUPERBUILD_DEPENDENCIES(${${proj}_DEPENDENCIES})
# set proj back to its original value
set(proj QT4)
#use system libs always for Qt4 as we build them from source or have already in system
set(QT4_SB_CONFIG)
STRING(REGEX REPLACE "/$" "" CMAKE_WIN_INSTALL_PREFIX ${SB_INSTALL_PREFIX})
STRING(REGEX REPLACE "/$" "" CMAKE_WIN_INSTALL_PREFIX ${SB_INSTALL_PREFIX})
STRING(REGEX REPLACE "/" "\\\\" CMAKE_WIN_INSTALL_PREFIX ${CMAKE_WIN_INSTALL_PREFIX})
if(MSVC)
configure_file(${CMAKE_SOURCE_DIR}/patches/${proj}/configure_qt4.bat.in
${CMAKE_BINARY_DIR}/configure_qt4.bat
@ONLY)
ExternalProject_Add(${proj}
PREFIX ${proj}
URL "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
......@@ -60,14 +60,14 @@ else()
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND
${QT4_SB_SRC}/configure -prefix ${SB_INSTALL_PREFIX} -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L ${SB_INSTALL_PREFIX}/lib -I ${SB_INSTALL_PREFIX}/include
${QT4_SB_SRC}/configure -prefix ${SB_INSTALL_PREFIX} -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -no-fontconfig -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L ${SB_INSTALL_PREFIX}/lib -I ${SB_INSTALL_PREFIX}/include
DEPENDS ${${proj}_DEPENDENCIES}
)
endif()
#copying Qt4 to have out-of-source build takes too much disk space
# ExternalProject_Add_Step(${proj} copy_source
# COMMAND ${CMAKE_COMMAND} -E copy_directory
# COMMAND ${CMAKE_COMMAND} -E copy_directory
# ${QT4_SB_SRC} ${QT4_SB_BUILD_DIR}
# DEPENDEES patch update
# DEPENDERS configure
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment