Commit 04cef032 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Merge branch 'master' into kazakov/svg-loading

parents 72db3d4a 2db589ab
......@@ -47,6 +47,10 @@ message( STATUS "CMAKE_CL_64: ${CMAKE_CL_64}")
set(GLOBAL_BUILD_TYPE RelWithDebInfo)
set(GLOBAL_PROFILE ${GLOBAL_PROFILE} -DBUILD_TESTING=false)
if (DEFINED EP_PREFIX)
set_directory_properties(PROPERTIES EP_PREFIX ${EP_PREFIX})
endif (DEFINED EP_PREFIX)
if (MSVC)
set(GLOBAL_PROFILE ${GLOBAL_PROFILE} -DCMAKE_EXE_LINKER_FLAGS=/PROFILE -DCMAKE_SHARED_LINKER_FLAGS=/PROFILE)
set(PATCH_COMMAND myptch)
......
......@@ -25,7 +25,12 @@ Note: on all operating systems the entire procedure is done in a terminal window
3. Make sure you have a compiler:
* Linux: gcc, minimum version 4.8
* OSX: clang, you need to install xcode for this
* Windows: (http://tdm-gcc.tdragon.net/, version 5.1). MSVC cannot build G'Mic correctly. Remember to install the OpenMP plugin in tdm-gcc. Make sure mingw's bin folder is in your path.
* Windows: mingw-w64 5.4 (by mingw-builds)
- 32-bit (x86) target: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/5.4.0/threads-posix/dwarf/
- 64-bit (x64) target: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.4.0/threads-posix/seh/
Make sure mingw's bin folder is in your path. It might be a good
idea to create a batch file which sets the path and start cmd.
MSVC is *not* supported at the moment.
4. If you compile Qt on Windows, you will also need Python: https://www.python.org. Make sure to have python.exe in your path.
== Setup your environment ==
......@@ -48,7 +53,13 @@ Note: on all operating systems the entire procedure is done in a terminal window
== Prepare the externals build ==
1. enter the BUILDROOT/b directory
2. run cmake:
2. The cmake command needs to point to your BUILDROOT like /dev/d, not c:\dev\d.
set PATH=BUILDROOT\i\bin\;BUILDROOT\i\lib;%PATH%
cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=/dev/d -DINSTALL_ROOT=/dev/i -G "MinGW Makefiles"
3. run cmake:
* Linux:
export PATH=$BUILDROOT/i/bin
......@@ -72,12 +83,8 @@ Note: on all operating systems the entire procedure is done in a terminal window
* Windows 64 bits:
Note that the cmake command needs to point to your BUILDROOT like /dev/d, not c:\dev\d.
set PATH=BUILDROOT\i\bin\;BUILDROOT\i\lib;%PATH%
cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=/dev/d -DINSTALL_ROOT=/dev/i -G "MinGW Makefiles"
3. build the packages:
4. build the packages:
With a judicious application of DEPENDS statements, it's possible to build it all in one go, but in my experience that fails always, so it's better to build the dependencies independently.
......@@ -171,19 +178,19 @@ On Windows
Depending on what you want to use, run this command for MSBuild:
cmake ..\krita -G "MinGW Makefiles" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
cmake ..\krita -G "MinGW Makefiles" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -Wno-dev -DDEFINE_NO_DEPRECATED=1
Or this to use jom (faster compiling, uses all cores, ships with QtCreator/pre-built Qt binaries):
cmake ..\krita -G "MinGW Makefiles" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -DPACKAGERS_BUILD=ON -Wno-dev -DDEFINE_NO_DEPRECATED=1
cmake ..\krita -G "MinGW Makefiles" -DBoost_DEBUG=OFF -DBOOST_INCLUDEDIR=c:\dev\i\include -DBOOST_DEBUG=ON -DBOOST_ROOT=c:\dev\i -DBOOST_LIBRARYDIR=c:\dev\i\lib -DCMAKE_INSTALL_PREFIX=c:\dev\i -DCMAKE_PREFIX_PATH=c:\dev\i -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DHAVE_MEMORY_LEAK_TRACKER=OFF -Wno-dev -DDEFINE_NO_DEPRECATED=1
On Linux
cmake ../krita -DCMAKE_INSTALL_PREFIX=BUILDROOT/i -DDEFINE_NO_DEPRECATED=1 -DPACKAGERS_BUILD=ON -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfobg
cmake ../krita -DCMAKE_INSTALL_PREFIX=BUILDROOT/i -DDEFINE_NO_DEPRECATED=1 -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfobg
On OSX
cmake ../krita -DCMAKE_INSTALL_PREFIX=/Users/boud/dev/i -DDEFINE_NO_DEPRECATED=1 -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DPACKAGERS_BUILD=ON -DBUNDLE_INSTALL_DIR=$HOME/dev/i/bin -DCMAKE_BUILD_TYPE=RelWithDebInfo
cmake ../krita -DCMAKE_INSTALL_PREFIX=$BUILDROOT/i -DDEFINE_NO_DEPRECATED=1 -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DBUNDLE_INSTALL_DIR=$BUILDROOT/i/bin -DCMAKE_BUILD_TYPE=RelWithDebInfo
4. Run
......
......@@ -13,7 +13,6 @@ if (MSVC)
INSTALL_DIR ${EXTPREFIX_boost}
UPDATE_COMMAND ""
ALWAYS 0
BUILD_IN_SOURCE 1
)
ExternalProject_Add_Step(
......@@ -37,7 +36,6 @@ if (MSVC)
INSTALL_DIR ${EXTPREFIX_boost}
UPDATE_COMMAND ""
ALWAYS 0
BUILD_IN_SOURCE 1
)
ExternalProject_Add_Step(
......@@ -63,7 +61,6 @@ elseif(MINGW)
INSTALL_DIR ${EXTPREFIX_boost}
UPDATE_COMMAND ""
ALWAYS 0
BUILD_IN_SOURCE 1
)
ExternalProject_Add_Step(
......@@ -84,7 +81,6 @@ else()
INSTALL_DIR ${PREFIX_ext_boost}
UPDATE_COMMAND ""
ALWAYS 0
BUILD_IN_SOURCE 1
)
endif()
......@@ -16,7 +16,6 @@ if (MSVC OR MINGW)
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.yes ${PREFIX_ext_drmingw}/bin/
UPDATE_COMMAND ""
ALWAYS 0
)
else ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
ExternalProject_Add(ext_drmingw
......@@ -34,7 +33,6 @@ if (MSVC OR MINGW)
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.yes ${PREFIX_ext_drmingw}/bin/
UPDATE_COMMAND ""
ALWAYS 0
)
endif ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
endif (MSVC OR MINGW)
......@@ -9,5 +9,4 @@ ExternalProject_Add( ext_eigen3
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_eigen3} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
)
......@@ -12,6 +12,5 @@ ExternalProject_Add( ext_exiv2
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_exiv2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF -DEXIV2_ENABLE_NLS=OFF -DICONV_INCLUDE_DIR=${PREFIX_ext_exiv2}/include
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_iconv ext_zlib ext_expat
)
......@@ -11,7 +11,6 @@ ExternalProject_Add( ext_expat
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DBUILD_tests=OFF -DBUILD_examples=OFF -DBUILD_tools=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch
)
......@@ -28,7 +27,6 @@ ExternalProject_Add( ext_expat
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
)
......
......@@ -14,7 +14,6 @@ if (MSVC)
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
UPDATE_COMMAND ""
ALWAYS 0
)
else()
ExternalProject_Add( ext_fftw3
......@@ -30,7 +29,6 @@ if (MSVC)
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
UPDATE_COMMAND ""
ALWAYS 0
)
endif()
elseif (MINGW)
......@@ -48,7 +46,6 @@ elseif (MINGW)
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
UPDATE_COMMAND ""
ALWAYS 0
)
else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
ExternalProject_Add( ext_fftw3
......@@ -64,7 +61,6 @@ elseif (MINGW)
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${PREFIX_ext_fftw3}/include
UPDATE_COMMAND ""
ALWAYS 0
)
endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
else ()
......@@ -79,6 +75,5 @@ ExternalProject_Add( ext_fftw3
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
)
endif ()
......@@ -9,5 +9,4 @@ ExternalProject_Add( ext_fontconfig
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
)
......@@ -18,7 +18,7 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
ExternalProject_Add(
ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/extra-cmake-modules-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/extra-cmake-modules-5.24.0.zip
URL_MD5 e0c19ba97ebd964f9bdc9110c64ce96a
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
......@@ -28,14 +28,13 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
)
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/karchive-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/karchive-5.24.0.zip
URL_MD5 739843accfe9bd85ab2f1582722cf01e
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -44,7 +43,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_extra_cmake_modules
)
......@@ -52,7 +50,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kconfig-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kconfig-5.24.0.zip
URL_MD5 f87ecff795eb76e4ec6561758a5baf87
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
......@@ -62,7 +60,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_karchive
)
......@@ -70,7 +67,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kwidgetsaddons-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kwidgetsaddons-5.24.0.zip
URL_MD5 0e399b427814a4814c65a3cf407f9d79
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
......@@ -80,7 +77,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kconfig
)
......@@ -88,7 +84,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kcompletion-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kcompletion-5.24.0.zip
URL_MD5 e8764251ab45005aa81dba242852300c
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -97,7 +93,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kwidgetsaddons
)
......@@ -105,7 +100,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kcoreaddons-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kcoreaddons-5.24.0.zip
URL_MD5 2885878625b19ad0300ef3770b897112
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
......@@ -115,7 +110,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kcompletion
)
......@@ -123,7 +117,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kguiaddons-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kguiaddons-5.24.0.zip
URL_MD5 9bdadbc57d0634816ef80ee9798c3d6c
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -132,7 +126,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kcoreaddons
)
......@@ -151,7 +144,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kguiaddons
)
......@@ -159,7 +151,7 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kitemmodels-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kitemmodels-5.24.0.zip
URL_MD5 ff41589f48395fc01d5fc7887593779d
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -168,14 +160,13 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_ki18n
)
ExternalProject_Add(
ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kitemviews-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kitemviews-5.24.0.zip
URL_MD5 33f638d027a3011a6a69f7484eee3287
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -184,14 +175,13 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kitemmodels
)
ExternalProject_Add(
ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kimageformats-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kimageformats-5.24.0.zip
URL_MD5 c1964516bcb2bfe882858f0c0913deb5
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
......@@ -201,14 +191,13 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kitemviews
)
ExternalProject_Add(
ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kwindowsystem-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kwindowsystem-5.24.0.zip
URL_MD5 5915e4f63ded983af6db7db3a6cbae1a
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
......@@ -218,14 +207,13 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kimageformats
)
ExternalProject_Add(
ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.24/kcrash-5.24.0.zip
URL http://download.kde.org/Attic/frameworks/5.24/kcrash-5.24.0.zip
URL_MD5 a2e41e6650105fc3ac8fbd44afbae4fe
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -234,6 +222,5 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kwindowsystem
)
......@@ -8,5 +8,4 @@ ExternalProject_Add( ext_freetype
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_freetype} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
)
......@@ -11,7 +11,6 @@ ExternalProject_Add(
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_gettext} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch ext_iconv
)
else (MSVC OR MINGW)
......@@ -26,7 +25,6 @@ ExternalProject_Add( ext_gettext
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_iconv
)
endif (MSVC OR MINGW)
......@@ -11,7 +11,6 @@ ExternalProject_Add(
INSTALL_DIR ${EXTPREFIX_gsl}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_gsl} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
)
else()
ExternalProject_Add( ext_gsl
......@@ -23,6 +22,5 @@ ExternalProject_Add( ext_gsl
INSTALL_DIR ${EXTPREFIX_gsl}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_gsl} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DGSL_SHARED=ON
UPDATE_COMMAND ""
ALWAYS 0
)
endif()
......@@ -9,7 +9,6 @@ ExternalProject_Add( ext_iconv
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_iconv} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
)
else ()
ExternalProject_Add( ext_iconv
......@@ -25,7 +24,6 @@ ExternalProject_Add( ext_iconv
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
)
endif ()
......@@ -7,7 +7,6 @@ ExternalProject_Add( ext_ilmbase
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_ilmbase} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
UPDATE_COMMAND ""
ALWAYS 0
)
if (MSVC)
......
......@@ -9,7 +9,6 @@ ExternalProject_Add( ext_jpeg
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_jpeg} -DWITH_SIMD=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
)
else()
ExternalProject_Add( ext_jpeg
......@@ -22,6 +21,5 @@ ExternalProject_Add( ext_jpeg
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
)
endif()