Commit 30abe0db authored by Alvin Wong's avatar Alvin Wong

Remove `ALWAYS 0` "option" to ExternalProject_Add

It is actually not an available option; and thanks to how ExternalProject
is parsing the options, the `UPDATE_COMMAND ""` option that is often
conveniently placed immediately before that would cause CMake to always
rebuild the external project.

Removing them should stop most unnecessary rebuilds.
parent 1cde9251
......@@ -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
)
......@@ -28,7 +28,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
)
......@@ -44,7 +43,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_extra_cmake_modules
)
......@@ -62,7 +60,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_karchive
)
......@@ -80,7 +77,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kconfig
)
......@@ -97,7 +93,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kwidgetsaddons
)
......@@ -115,7 +110,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kcompletion
)
......@@ -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
)
......@@ -168,7 +160,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_ki18n
)
......@@ -184,7 +175,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kitemmodels
)
......@@ -201,7 +191,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kitemviews
)
......@@ -218,7 +207,6 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_kimageformats
)
......@@ -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()
......@@ -10,7 +10,6 @@ ExternalProject_Add( ext_lcms2
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_lcms2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_TESTS=FALSE -DBUILD_UTILS=FALSE -DBUILD_STATIC=FALSE
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch
)
else (MSVC OR MINGW)
......@@ -24,6 +23,5 @@ ExternalProject_Add( ext_lcms2
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
)
endif (MSVC OR MINGW)
......@@ -8,7 +8,6 @@ ExternalProject_Add( ext_libraw
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libraw} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_lcms2 ext_jpeg
)
......@@ -10,7 +10,6 @@ if (MSVC OR MINGW)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libxml2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch ext_iconv ext_zlib
)
else (MSVC OR MINGW)
......@@ -25,7 +24,6 @@ else (MSVC OR MINGW)
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_iconv ext_zlib
)
endif (MSVC OR MINGW)
......@@ -10,7 +10,6 @@ ExternalProject_Add( ext_libxslt
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_libxslt} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch ext_libxml2
)
else (MSVC OR MINGW)
......@@ -24,7 +23,6 @@ ExternalProject_Add( ext_libxslt
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_libxml2
)
endif (MSVC OR MINGW)
......@@ -17,7 +17,6 @@ ExternalProject_Add(
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_ocio} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TRUELIGHT=OFF -DOCIO_BUILD_NUKE=OFF -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYGLUE=OFF -DOCIO_BUILD_STATIC_JNIGLUE=OFF
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_boost
)
else()
......@@ -31,7 +30,6 @@ ExternalProject_Add(
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_ocio} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TRUELIGHT=OFF -DOCIO_BUILD_NUKE=OFF -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_PYGLUE=OFF -DOCIO_BUILD_STATIC_JNIGLUE=OFF
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_boost
)
endif()
......@@ -12,7 +12,6 @@ ExternalProject_Add( ext_openexr
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_openexr} -DILMBASE_PACKAGE_PREFIX=${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_ilmbase ext_zlib
)
else()
......@@ -27,7 +26,6 @@ ExternalProject_Add(ext_openexr
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_openexr} -DILMBASE_PACKAGE_PREFIX=${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_ilmbase ext_zlib
)
endif()
......@@ -10,5 +10,4 @@ ExternalProject_Add( ext_patch
COMMAND ${CMAKE_COMMAND} -E copy bin/patch.exe ${PREFIX_ext_patch}/bin/myptch.exe
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
)
......@@ -8,6 +8,5 @@ ExternalProject_Add( ext_png
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_png} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_zlib
)
......@@ -12,5 +12,4 @@ ExternalProject_Add( ext_png2ico
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
)
......@@ -9,5 +9,4 @@ ExternalProject_Add( ext_poppler
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_poppler} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=FALSE -BUILD_CPP_TESTS=FALSE -DENABLE_UTILS=FALSE -DENABLE_GLIB=FALSE -DENABLE_LIBOPENJPEG=FALSE
UPDATE_COMMAND ""
ALWAYS 0
)
......@@ -9,6 +9,5 @@ ExternalProject_Add( ext_pthreads
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_pthreads} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch
)
......@@ -21,7 +21,6 @@ if (WIN32)
INSTALL_COMMAND mingw32-make install
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
DEPENDS ext_patch
)
elseif (NOT APPLE)
......@@ -39,7 +38,6 @@ elseif (NOT APPLE)
INSTALL_COMMAND $(MAKE) install
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
)
else( APPLE )
......@@ -181,6 +179,5 @@ else( APPLE )
INSTALL_COMMAND make install
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
ALWAYS 0
)
endif()
......@@ -10,7 +10,6 @@ ExternalProject_Add( ext_tiff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_tiff} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch ext_zlib ext_jpeg
)
else (MSVC OR MINGW)
......@@ -24,7 +23,6 @@ ExternalProject_Add( ext_tiff
INSTALL_COMMAND make install
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_zlib ext_jpeg
)
endif (MSVC OR MINGW)
......@@ -10,6 +10,5 @@ ExternalProject_Add( ext_vc
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_vc} -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PROCESSOR=x86
UPDATE_COMMAND ""
ALWAYS 0
)
......@@ -11,7 +11,6 @@ ExternalProject_Add(
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_zlib} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_patch
)
else ()
......@@ -25,6 +24,5 @@ ExternalProject_Add( ext_zlib
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_zlib} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
UPDATE_COMMAND ""
ALWAYS 0
)
endif ()
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