cmake: -flto is now disabled, since it causes a lot of troubles

--- src/cmake/common-settings.cmake
+++ src/cmake/common-settings.cmake
@@ -182,7 +182,7 @@
 	compile_flag("-fvisibility=hidden"   VISIBILITY_HIDDEN    RELEASE DEBUG RELWITHDEBINFO)

 	# link
-	compile_flag("-flto"                 FLTO  RELEASE RELWITHDEBINFO)
+	#compile_flag("-flto"                 FLTO  RELEASE RELWITHDEBINFO)

 	# debugging symbols
 	compile_flag("-g"     DEBUG_G     DEBUG RELWITHDEBINFO)


Minor correction to remote-queue submission.

--- test/remote/RunRemoteTest.cmake
+++ test/remote/RunRemoteTest.cmake
@@ -90,6 +90,7 @@
 execute_process (COMMAND "${CMAKE_COMMAND}" -E tar czf "${changefile}" "."
   WORKING_DIRECTORY "${workdir}")
 file (REMOVE_RECURSE "${workdir}")
+get_filename_component (changefile "${changefile}" NAME)

 # Testing option: Don't submit job at all if "packageonly" is set
 if (packageonly)


MSVC: build GDAL from source

MSVC: build GDAL from source

--- CMake/External_GDAL.cmake
+++ CMake/External_GDAL.cmake
@@ -31,6 +31,24 @@
       )
     list(APPEND ${proj}_DEPENDENCIES GEOTIFF)
   endif()
+
+  if(USE_SYSTEM_PNG)
+    set(GDAL_SB_PNG_CONFIG)
+  else()
+    set(GDAL_SB_PNG_CONFIG
+      --with-png=${CMAKE_INSTALL_PREFIX}
+      )
+    list(APPEND ${proj}_DEPENDENCIES PNG)
+  endif()
+
+  # if(USE_SYSTEM_JPEG)
+    # set(GDAL_SB_JPEG_CONFIG)
+  # else()
+    # set(GDAL_SB_JPEG_CONFIG
+      # --with-jpeg=${CMAKE_INSTALL_PREFIX}
+      # )
+    # list(APPEND ${proj}_DEPENDENCIES JPEG)
+  # endif()

   if(USE_SYSTEM_OPENJPEG)
     set(GDAL_SB_OPENJPEG_CONFIG)
@@ -87,6 +105,15 @@
     list(APPEND ${proj}_DEPENDENCIES LIBKML)
   endif()

+    if(USE_SYSTEM_CURL)
+    set(GDAL_SB_CURL_CONFIG)
+  else()
+    set(GDAL_SB_CURL_CONFIG
+      --with-curl=${CMAKE_INSTALL_PREFIX}
+      )
+    list(APPEND ${proj}_DEPENDENCIES CURL)
+  endif()
+
   if(UNIX)
     ExternalProject_Add(${proj}
       PREFIX ${proj}
@@ -94,6 +121,9 @@
       URL_MD5 9fdf0f2371a3e9863d83e69951c71ec4
       BINARY_DIR ${GDAL_SB_BUILD_DIR}
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      DEPENDS ${${proj}_DEPENDENCIES}
+      UPDATE_COMMAND  ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
+      PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath
       CONFIGURE_COMMAND
         # use 'env' because CTest launcher doesn't perform shell interpretation
         env LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib
@@ -105,77 +135,52 @@
         ${GDAL_SB_ZLIB_CONFIG}
         ${GDAL_SB_TIFF_CONFIG}
         ${GDAL_SB_GEOTIFF_CONFIG}
+        ${GDAL_SB_PNG_CONFIG}
         ${GDAL_SB_OPENJPEG_CONFIG}
         ${GDAL_SB_SQLITE_CONFIG}
         ${GDAL_SB_GEOS_CONFIG}
         ${GDAL_SB_EXPAT_CONFIG}
         ${GDAL_SB_LIBKML_CONFIG}
-        BUILD_COMMAND $(MAKE)
-        INSTALL_COMMAND $(MAKE) install
-        DEPENDS ${${proj}_DEPENDENCIES}
-        PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath
+      BUILD_COMMAND $(MAKE)
+      INSTALL_COMMAND $(MAKE) install
+    )
+
+  else(MSVC)
+  ##add libkml
+    list(REMOVE_ITEM ${proj}_DEPENDENCIES LIBKML)
+
+    STRING(REGEX REPLACE "/" "\\\\" CMAKE_WIN_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+    configure_file(${CMAKE_SOURCE_DIR}/patches/${proj}/nmake_gdal_extra.opt.in ${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt)
+
+    ExternalProject_Add(${proj}_build
+       PREFIX ${proj}
+       URL "http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.gz"
+       URL_MD5 9fdf0f2371a3e9863d83e69951c71ec4
+       BINARY_DIR ${GDAL_SB_BUILD_DIR}
+       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+       DEPENDS ${${proj}_DEPENDENCIES}
+       PATCH_COMMAND  ${CMAKE_COMMAND} -E copy_directory  ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
+       CONFIGURE_COMMAND ""
+       BUILD_COMMAND ${SB_MAKE_CMD} /f ${GDAL_SB_BUILD_DIR}/Makefile.vc MSVC_VER=${SB_MSVC_VER} EXT_NMAKE_OPT=${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt
+       INSTALL_COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
+      ${CMAKE_BINARY_DIR}/${proj}/_install
     )

-    ExternalProject_Add_Step(${proj} copy_source
-        COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
-        DEPENDEES patch update
-        DEPENDERS configure
-    )
+    ExternalProject_Add(${proj}
+      PREFIX ${proj}/_install
+      DOWNLOAD_COMMAND ""
+      SOURCE_DIR ${proj}/_install
+      BINARY_DIR ${GDAL_SB_BUILD_DIR}
+      INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      CMAKE_CACHE_ARGS
+        -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_BUILD_TYPE:STRING=Release
+        -DGDAL_INCLUDE_DIR:STRING=${GDAL_SB_BUILD_DIR}
+        -DGDAL_LIB_DIR:STRING=${GDAL_SB_BUILD_DIR}
+      DEPENDS ${proj}_build
+      CMAKE_COMMAND
+    )

-  else(WIN32)
-    if(MSVC10)
-        set(URL_PREFIX "release-1600")
-        set(GDAL_LIBS_URL_HASH 2a3e4db48c68d490e3101b5ca98a4bce)
-        set(GDAL_DLL_URL_HASH cc5f45081ec0d0a7604816fabf5f2588)
-    else(MSVC80)
-         set(URL_PREFIX "release-1500")
-    else(CMAKE_COMPILER_2005)
-        set(URL_PREFIX "release-1400")
-    endif()
-
-    set(GDAL_LIBS_URL "http://download.gisinternals.com/sdk/downloads/${URL_PREFIX}-gdal-1-11-1-mapserver-6-4-1-libs.zip")
-    set(GDAL_DLL_URL "http://download.gisinternals.com/sdk/downloads/${URL_PREFIX}-gdal-1-11-1-mapserver-6-4-1.zip")
-
-    #TODO: find hash for archives properly
-    set(GDAL_LIBS_URL_HASH 2a3e4db48c68d490e3101b5ca98a4bce)
-    set(GDAL_DLL_URL_HASH cc5f45081ec0d0a7604816fabf5f2588)
-
-    ExternalProject_Add(${proj}_BIN
-        PREFIX ${proj}/_BIN
-        URL ${GDAL_DLL_URL}
-        URL_MD5 ${GDAL_DLL_URL_HASH}
-        SOURCE_DIR ${GDAL_SB_SRC}
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${CMAKE_INSTALL_PREFIX}
-     )
-
-    ExternalProject_Add(${proj}
-        PREFIX ${proj}
-        URL ${GDAL_LIBS_URL}
-        URL_MD5 ${GDAL_LIBS_URL_HASH}
-        SOURCE_DIR ${GDAL_SB_SRC}
-        DEPENDS ${proj}_BIN
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory  ${GDAL_SB_SRC} ${CMAKE_INSTALL_PREFIX}
-    )
-
-    ExternalProject_Add_Step(${proj} remove_libkml_headers
-        COMMAND ${CMAKE_COMMAND} -E remove_directory
-        ${CMAKE_INSTALL_PREFIX}/include/kml
-        DEPENDEES install
-    )
-
-    foreach(KMLLIB "base" "convenience" "regionator" "dom" "engine" "xsd")
-        ExternalProject_Add_Step(${proj} remove_libkml_${KMLLIB}
-        COMMAND ${CMAKE_COMMAND} -E remove
-        ${CMAKE_INSTALL_PREFIX}/lib/libkml${KMLLIB}.lib
-        DEPENDEES remove_libkml_headers
-    )
-    endforeach()
-
   endif()

   message(STATUS "  Using GDAL SuperBuild version")


Version 3 of Oculus Support for OSS

Version 3 of Oculus Support for OSS

--- CMake/FindOculusSdk.cmake
+++ CMake/FindOculusSdk.cmake
@@ -51,8 +51,8 @@
 		set(ARCH Win32)
 	endif()

-	set(WIN_DEBUG   Lib/Windows/${ARCH}/Debug/VS2012)
-	set(WIN_RELEASE Lib/Windows/${ARCH}/Release/VS2012)
+	set(DEBUG_LIB_DIR   LibOVR/Lib/Windows/${ARCH}/Debug/VS2012)
+	set(RELEASE_DIR_DIR LibOVR/Lib/Windows/${ARCH}/Release/VS2012)
 else()
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 		set(ARCH x86_64)
@@ -60,27 +60,25 @@
 		set(ARCH i386)
 	endif()

-	set(LINUX_DEBUG Lib/Linux/${ARCH}/Debug)
-	set(LINUX_RELEASE Lib/Linux/${ARCH}/Release)
+	set(DEBUG_LIB_DIR   LibOVR/Lib/Linux/${ARCH}/Debug)
+	set(RELEASE_LIB_DIR LibOVR/Lib/Linux/${ARCH}/Release)
 endif()

 find_library(OCULUSSDK_LIBRARY_RELEASE
 	NAMES libOVR libOVR.a
+	PATH_SUFFIXES ${RELEASE_LIB_DIR}
 	HINTS
-		${OCULUSSDK_DIR}/LibOVR/${LINUX_RELEASE}
-		${OCULUSSDK_DIR}/LibOVR/${WIN_RELEASE}
-		$ENV{OCULUSSDK_DIR}/LibOVR/${LINUX_RELEASE}
-		$ENV{OCULUSSDK_DIR}/LibOVR/${WIN_RELEASE}
+		${OCULUSSDK_DIR}
+		$ENV{OCULUSSDK_DIR}
 	PATHS /usr /usr/local
 )

 find_library(OCULUSSDK_LIBRARY_DEBUG
 	NAMES libOVR libOVR.a
+	PATH_SUFFIXES ${DEBUG_LIB_DIR}
 	HINTS
-		${OCULUSSDK_DIR}/LibOVR/${LINUX_DEBUG}
-		${OCULUSSDK_DIR}/LibOVR/${WIN_DEBUG}
-		$ENV{OCULUSSDK_DIR}/LibOVR/${LINUX_DEBUG}
-		$ENV{OCULUSSDK_DIR}/LibOVR/${WIN_DEBUG}
+		${OCULUSSDK_DIR}
+		$ENV{OCULUSSDK_DIR}
 )

 if(NOT OCULUSSDK_LIBRARY)
@@ -107,12 +105,9 @@
 endif()

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OculusSdk
-	FAIL_MESSAGE "OculusSDK was not found, this could be due to a missing \
-environment variable or a change in library structure.\
- Please make sure version 0.5.0.1 beta is installed."
+find_package_handle_standard_args(OculusSdk
 	REQUIRED_VARS OCULUSSDK_INCLUDE_DIR OCULUSSDK_VERSION_H OCULUSSDK_LIBRARY
-	VERSION_VAR OCULUSSDK_VERSION
+	VERSION_VAR   OCULUSSDK_VERSION
 )

 #Workaround, appending missing 3rd party libraries


Missing dll on install

Missing dll on install

The current code did not account for the QT library QtScript.  It is now
added to the install package.

--- CMake/VisomicsCPack.cmake
+++ CMake/VisomicsCPack.cmake
@@ -5,7 +5,7 @@

 SET(QT_INSTALL_LIB_DIR ${Visomics_INSTALL_LIB_DIR})

-SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL QTOPENGL QTWEBKIT PHONON QTXMLPATTERNS)
+SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL QTOPENGL QTWEBKIT PHONON QTXMLPATTERNS QTSCRIPT)
 IF(UNIX OR APPLE)
   LIST(APPEND QTLIBLIST QTDBUS)
 ENDIF()


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 04)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   10)
+SET(KWSYS_DATE_STAMP_DAY   11)


KWSys Nightly Date Stamp

KWSys Nightly Date Stamp

--- Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
+++ Modules/ThirdParty/KWSys/src/KWSys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@
 SET(KWSYS_DATE_STAMP_MONTH 05)

 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   07)
+SET(KWSYS_DATE_STAMP_DAY   08)


Look for debug library of glbinding

Look for debug library of glbinding

--- sequoia-cmake/cmake/Findglbinding.cmake
+++ sequoia-cmake/cmake/Findglbinding.cmake
@@ -112,7 +112,7 @@
 # Find glbinding library
 #
 if(NOT(GLBINDING_LIBRARIES))
-  find_library(GLBINDING_LIBRARIES NAMES glbinding HINTS ${GLBINDING_ROOT}/lib)
+  find_library(GLBINDING_LIBRARIES NAMES glbinding glbindingd HINTS ${GLBINDING_ROOT}/lib)
 endif()

 #


Adjust warnings flags, as requested

Adjust warnings flags, as requested

Signed-off-by: Ferry Huberts <66e11f9f5d965b69497c7e73d5e808f8b13c1218@pelagic.nl>

--- cmake/ci.cmake
+++ cmake/ci.cmake
@@ -99,7 +99,7 @@
     -Wno-extra-semi-stmt                                 \
     -Wno-padded                                          \
     -Wno-range-loop-analysis                             \
-    -Wno-switch-enum -Wno-covered-switch-default         \
+    -Wno-covered-switch-default                          \
     -Wno-weak-vtables                                    \
 ")

@@ -326,7 +326,7 @@
     -Wswitch                                          \
     -Wswitch-bool                                     \
     -Wswitch-default                                  \
-    -Wno-switch-enum                                     \
+    -Wswitch-enum                                     \
     -Wswitch-outside-range                            \
     -Wswitch-unreachable                              \
     -Wsync-nand                                       \


Renamed configuration variables.

Renamed configuration variables.

--- cmake/eb.cmake
+++ cmake/eb.cmake
@@ -1,9 +1,8 @@
 message(STATUS "Binary elliptic curve arithmetic configuration (EB module):\n")

 message("   ** Options for the binary elliptic curve module (default = on, w = 4):")
-message("      EB_ORDIN=[off|on] Support for ordinary curves.")
-message("      EB_SUPER=[off|on] Support for supersingular curves.")
-message("      EB_KBLTZ=[off|on] Special support for Koblitz curves.")
+message("      EB_PLAIN=[off|on] Support for ordinary curves without endomorphisms.")
+message("      EB_KBLTZ=[off|on] Support for Koblitz anomalous binary curves.")
 message("      EB_MIXED=[off|on] Use mixed coordinates.")
 message("      EB_PRECO=[off|on] Build precomputation table for generator.")
 message("      EB_DEPTH=w        Width w in [2,6] of precomputation table for fixed point methods.")


Disable EXPRECISION for the combination of DYNAMIC_CORE and GENERIC target

--- cmake/os.cmake
+++ cmake/os.cmake
@@ -84,6 +84,10 @@
   set(NO_EXPRECISION 1)
 endif ()

+if ((DYNAMIC_ARCH) AND (${TARGET} STREQUAL "GENERIC))
+  set(NO_EXPRECISION 1)
+endif ()
+
 if (UTEST_CHECK)
   set(CCOMMON_OPT "${CCOMMON_OPT} -DUTEST_CHECK")
   set(SANITY_CHECK 1)


CMake: fix ios toolchain sysroot issue with cmake 3.7

--- CMake/toolchain/ios.toolchain.xcode.cmake
+++ CMake/toolchain/ios.toolchain.xcode.cmake
@@ -74,11 +74,7 @@
 set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
 set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")

-# Hidden visibilty is required for cxx on iOS
 set (CMAKE_C_FLAGS_INIT "")
-# use of CMAKE_OSX_SYSROOT is fine here even though it is set later on because this string
-# is evaluated after at the end of the generate step where is has been set
-set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden -isysroot ${CMAKE_OSX_SYSROOT}")

 set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
 set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
@@ -149,6 +145,9 @@
 # Set the sysroot default to the most recent SDK
 set (CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support")

+# Hidden visibilty is required for cxx on iOS
+set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden -isysroot ${CMAKE_OSX_SYSROOT}")
+
 # set the architecture for iOS
 # NOTE: Currently both ARCHS_STANDARD_32_BIT and ARCHS_UNIVERSAL_IPHONE_OS set armv7 only, so set both manually
 if (${IOS_PLATFORM} STREQUAL "OS")


testing: append the tests to the given variable

Change-Id: Ib63073b5ce7a740a2bfb43383dc5cd1841aae239

--- CMake/vtkTestingMacros.cmake
+++ CMake/vtkTestingMacros.cmake
@@ -83,7 +83,7 @@
 #   The 'vtk_test_prefix' variable may be set to create separate tests from a
 #   single test name (e.g., running with different arguments), but should be
 #   used only when required.
-function(vtk_add_test_mpi exename tests)
+function(vtk_add_test_mpi exename _tests)
   set(mpi_options
     TESTING_DATA
     CUSTOM_BASELINES
@@ -150,7 +150,7 @@
       )
   endforeach()

-  set(${tests} "${names}"
+  set(${_tests} ${${_tests}} "${names}"
     PARENT_SCOPE)
 endfunction()

@@ -253,7 +253,7 @@
       )
   endforeach()

-  set(${_tests} "${names}"
+  set(${_tests} ${${_tests}} "${names}"
     PARENT_SCOPE)
 endfunction()


CMake: Disable -Wl,--as-needed in DEAL_II_HAVE_USABLE_FLAGS

This works around a serious regression with ld.bfd in combination with
-Wl,--as-needed when compiling a simple

  int main () { return 0; }

and linking against a *huge* list of (entirely unused) libraries.

See #3686

--- cmake/macros/macro_check_compiler_setup.cmake
+++ cmake/macros/macro_check_compiler_setup.cmake
@@ -27,10 +27,28 @@

 MACRO(CHECK_COMPILER_SETUP _compiler_flags_unstr _linker_flags_unstr _var)
   #
+  # Strip -Wl,--as-needed from the list of linker flags. This works around
+  # a serious regression with ld.bfd in combination with -Wl,--as-needed
+  # when compiling a simple
+  #
+  #    int main () { return 0; }
+  #
+  # and linking against a *huge* list of (entirely unused) libraries.
+  #
+  # Ideally, one should use ld.gold [1] instead of ld.bfd - but because
+  # this is not always possible, simply disable -Wl,--as-needed.
+  #
+  # See https://github.com/dealii/dealii/issues/3686
+  #
+  # [1] https://lwn.net/Articles/274859/
+  #
+  STRING(REPLACE "-Wl,--as-needed" "" _linker_flags "${_linker_flags_unstr}")
+
+  #
   # Strip leading and trailing whitespace to make CMake 2.8.8 happy
   #
   STRING(STRIP "${_compiler_flags_unstr}" _compiler_flags)
-  STRING(STRIP "${_linker_flags_unstr}" _linker_flags)
+  STRING(STRIP "${_linker_flags}" _linker_flags)

   #
   # Rerun this test if flags have changed:


CMake: Concatenate subsequent compiler flag strings with a space

Otherwise compilation of a target that already has compile flags and is
set up with DEAL_II_SETUP_TARGET will fail.

--- cmake/macros/macro_deal_ii_setup_target.cmake
+++ cmake/macros/macro_deal_ii_setup_target.cmake
@@ -108,7 +108,7 @@
     INCLUDE_DIRECTORIES "${DEAL_II_INCLUDE_DIRS}"
     )
   SET_PROPERTY(TARGET ${_target} APPEND_STRING PROPERTY
-    COMPILE_FLAGS "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}"
+    COMPILE_FLAGS " ${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}"
     )
   SET_PROPERTY(TARGET ${_target} APPEND_STRING PROPERTY
     LINK_FLAGS " ${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}"


added some comments into the cmake file

added some comments into the cmake file

--- cmake/FindCasaCore.cmake
+++ cmake/FindCasaCore.cmake
@@ -8,7 +8,7 @@
 #  CASACORE_LIBRARIES    - List of libraries when using casacore.
 #  CASACORE_FOUND        - True if casacore found.

-# http://www.mail-archive.com/cmake@cmake.org/msg26187.html
+
 #message("========== version: ${CasaCore_FIND_VERSION}")
 #message("========== ver major: ${CasaCore_FIND_VERSION_MAJOR}")
 #message("========== ver minor: ${CasaCore_FIND_VERSION_MINOR}")
@@ -16,16 +16,22 @@
 #message("========== exact: ${CasaCore_VERSION_EXACT}")
 #message("========== required: ${CasaCore_FIND_REQUIRED}")

-include(FindPkgConfig)
-pkg_check_modules(CFITSIO cfitsio>=3.0 REQUIRED)
-pkg_check_modules(WCSLIB wcslib>=4.7 REQUIRED)
+#include(FindPkgConfig)
+#pkg_check_modules(CFITSIO cfitsio>=3.0 REQUIRED)
+#pkg_check_modules(WCSLIB wcslib>=4.7 REQUIRED)

+#find_library(TEST_LIB NAMES oskar_ms
+#    PATHS
+#)

 IF (CASACORE_INCLUDE_DIR)
     # Already in cache, be silent
     SET(CASACORE_FIND_QUIETLY TRUE)
 ENDIF (CASACORE_INCLUDE_DIR)

+
+### mmm probably need to find the other deps too....
+### see: http://usg.lofar.org/websvn/filedetails.php?repname=repos+1&path=%2Fcode%2Ftrunk%2Fdevel_common%2Fcmake%2FFindCASACORE.cmake&rev=1513&sc=1
 if(CASACORE_FIND_QUIETLY OR NOT CASACORE_FIND_REQUIRED)
   find_package(LAPACK)
 else(CASACORE_FIND_QUIETLY OR NOT CASACORE_FIND_REQUIRED)


Added CUDA 5.2

Added CUDA 5.2

--- cmake/FindCudaArch.cmake
+++ cmake/FindCudaArch.cmake
@@ -3,7 +3,7 @@

 # Known NVIDIA GPU achitectures Torch can be compiled for.
 # This list will be used for CUDA_ARCH_NAME = All option
-SET(KNOWN_GPU_ARCHITECTURES "2.0 2.1(2.0) 3.0 3.5 5.0")
+SET(KNOWN_GPU_ARCHITECTURES "3.0 3.5 5.0 5.2")

 IF (CUDA_VERSION VERSION_GREATER "6.5")
    SET(KNOWN_GPU_ARCHITECTURES "${KNOWN_GPU_ARCHITECTURES} 5.2")
@@ -98,6 +98,13 @@
     unSET(CUDA_ARCH_PTX CACHE)
   ENDIF()

+  # Allow a user to specify architecture from env
+  IF($ENV{CUDA_ARCH_BIN})
+    SET(CUDA_ARCH_NAME "Manual")
+    SET(CUDA_ARCH_BIN $ENV{CUDA_ARCH_BIN})
+    unSET(CUDA_ARCH_PTX)
+  ENDIF()
+
   IF(${CUDA_ARCH_NAME} STREQUAL "Fermi")
     SET(__cuda_arch_bin "2.0 2.1(2.0)")
   elseIF(${CUDA_ARCH_NAME} STREQUAL "Kepler")


ADDED missing L0 section to find HAL files

--- cmake/FindSTM32HAL.cmake
+++ cmake/FindSTM32HAL.cmake
@@ -136,6 +136,28 @@

     SET(HAL_SRCS
         stm32f7xx_hal.c
+    )
+ELSEIF(STM32_FAMILY STREQUAL "L0")
+    SET(HAL_COMPONENTS adc comp cortex crc crs cryp dac dma exti firewall flash gpio i2c
+                       i2s irda iwdg lcd lptim lpuart pcd pwr rcc rng rtc smartcard
+                       smbus spi tim tsc uart usart utils wwdg)
+
+    SET(HAL_REQUIRED_COMPONENTS cortex pwr rcc)
+
+    # Components that have _ex sources
+    SET(HAL_EX_COMPONENTS adc comp crc cryp dac flash i2c pcd pwr rcc rtc smartcard tim uart usart)
+
+    # Components that have ll_ in names instead of hal_
+    SET(HAL_LL_COMPONENTS crs exti lpuart utils)
+
+    SET(HAL_PREFIX stm32l0xx_)
+
+    SET(HAL_HEADERS
+        stm32l0xx_hal.h
+        stm32l0xx_hal_def.h
+    )
+    SET(HAL_SRCS
+        stm32l0xx_hal.c
     )
 ENDIF()


CMake: fixes

CMake: fixes

--- cmake/globalmacros.cmake
+++ cmake/globalmacros.cmake
@@ -373,7 +373,7 @@
 # Example ivw_enable_modules_if(IVW_INTEGRATION_TESTS GLFW Base)
 # Needs to be called before ivw_register_modules
 function(ivw_enable_modules_if value)
-    if(NOT value)
+    if(NOT ${value})
         return()
     endif()
     foreach(name IN LISTS ARGN)


Handle Apple labeling armv8 as arm64 rather than aarch64

--- cmake/system_check.cmake
+++ cmake/system_check.cmake
@@ -54,14 +54,14 @@
   endif()
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
   set(X86 1)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
-  set(ARM 1)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
     set(ARM64 1)
   else()
     set(ARM 1)
   endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
+  set(ARM 1)
 elseif (${CMAKE_CROSSCOMPILING})
    if (${TARGET} STREQUAL "CORE2")
     if (NOT BINARY)


CMake: Bugfix: Export Boost_INCLUDE_DIRS to the user as well

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@29235 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/cmake/configure/configure_boost.cmake
+++ deal.II/cmake/configure/configure_boost.cmake
@@ -57,6 +57,9 @@
 MACRO(FEATURE_BOOST_CONFIGURE_EXTERNAL)
   INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})

+  # The user has to know the location of the boost headers as well:
+  LIST(APPEND DEAL_II_USER_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
+
   #
   # Remove "pthread" from Boost_LIBRARIES. Threading, if necessary, is
   # already set up via configure_1_threads.cmake.


[cpack] creating deb package

[cpack] creating deb package

--- CMakeModules/installer.cmake
+++ CMakeModules/installer.cmake
@@ -24,17 +24,13 @@
  set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"Eos\\\"")
  # it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
  SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
-
-endif(WIN32)
-
-if(APPLE)
+elseif(APPLE)
   set(CPACK_GENERATOR "DragNDrop")
+else()
+  # Linux gets a .tgz
+  SET(CPACK_GENERATOR "TGZ;DEB")
+  SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+  SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
 endif()

-if(LINUX)
-  # Linux gets a .tgz
-  SET(CPACK_GENERATOR "TGZ")
-  SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
-endif(LINUX)
-
 include(CPack)


ENH: Remove duplication of variables.

ENH: Remove duplication of variables.

ANTs_CLI_INSTALL_*_DESTINATION variables were set twice: once in Common.cmake and once in
SuperBuild.cmake.

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -215,12 +215,6 @@
     -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET})
 endif()

-set(${LOCAL_PROJECT_NAME}_CLI_RUNTIME_DESTINATION  bin)
-set(${LOCAL_PROJECT_NAME}_CLI_LIBRARY_DESTINATION  lib)
-set(${LOCAL_PROJECT_NAME}_CLI_ARCHIVE_DESTINATION  lib)
-set(${LOCAL_PROJECT_NAME}_CLI_INSTALL_RUNTIME_DESTINATION  bin)
-set(${LOCAL_PROJECT_NAME}_CLI_INSTALL_LIBRARY_DESTINATION  lib)
-set(${LOCAL_PROJECT_NAME}_CLI_INSTALL_ARCHIVE_DESTINATION  lib)
 #-----------------------------------------------------------------------------
 # Add external project CMake args
 #-----------------------------------------------------------------------------


Avoid unnecessary configure runs and correctly pass -j options for MAKE.

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -171,28 +171,31 @@
 # Project
 #-----------------------------------------------------------------------------

+if(CMAKE_GENERATOR MATCHES ".*Makefiles.*")
+  set(_build_cmd "$(MAKE)")
+else()
+  set(_build_cmd ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${MY_PROJECT_NAME}-build --config ${CMAKE_CFG_INTDIR})
+endif()
+
 # The variable SUPERBUILD_EXCLUDE_${MY_PROJECT_NAME}BUILD_TARGET should be set when submitting to a dashboard
 if(NOT DEFINED SUPERBUILD_EXCLUDE_${MY_PROJECT_NAME}BUILD_TARGET OR NOT SUPERBUILD_EXCLUDE_${MY_PROJECT_NAME}BUILD_TARGET)
-  set(proj ${MY_PROJECT_NAME}-build)
-  ExternalProject_Add(${proj}
-    DOWNLOAD_COMMAND ""
-    CONFIGURE_COMMAND ""
-    CMAKE_GENERATOR ${gen}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${MY_PROJECT_NAME}-build --config ${CMAKE_CFG_INTDIR}
-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    BINARY_DIR ${MY_PROJECT_NAME}-build
-    INSTALL_COMMAND ""
-    DEPENDS
-      "${MY_PROJECT_NAME}-Configure"
-    )
-endif()
+  set(_target_all_option "ALL")
+else()
+  set(_target_all_option "")
+endif()
+
+add_custom_target(${MY_PROJECT_NAME}-build ${_target_all_option}
+  COMMAND ${_build_cmd}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${MY_PROJECT_NAME}-build
+  DEPENDS ${MY_PROJECT_NAME}-Configure
+  )

 #-----------------------------------------------------------------------------
 # Custom target allowing to drive the build of the project itself
 #-----------------------------------------------------------------------------

 add_custom_target(${MY_PROJECT_NAME}
-  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/${MY_PROJECT_NAME}-build --config ${CMAKE_CFG_INTDIR}
+  COMMAND ${_build_cmd}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${MY_PROJECT_NAME}-build
 )


ENH: Added option CTEST_USE_LAUNCHERS to the CTK-Configure superbuild step.

See http://kitware.com/blog/home/post/11

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -296,6 +296,7 @@
   CMAKE_ARGS
     ${ctk_superbuild_boolean_args}
     -DCTK_SUPERBUILD:BOOL=OFF
+    -DCTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS}
     -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
     -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}


STYLE: Consistently reference *_SUPERBUILD CMake variables

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -52,7 +52,7 @@

 ExternalProject_Include_Dependencies(${proj}
   PROJECT_VAR proj
-  SUPERBUILD_VAR ${PROJECT_NAME}_SUPERBUILD
+  SUPERBUILD_VAR ${LOCAL_PROJECT_NAME}_SUPERBUILD
   )

 ExternalProject_Add(${proj}
@@ -74,7 +74,7 @@
     -DMIDAS_PACKAGE_EMAIL:STRING=${MIDAS_PACKAGE_EMAIL}
     -DMIDAS_PACKAGE_API_KEY:STRING=${MIDAS_PACKAGE_API_KEY}
     # Superbuild
-    -D${EXTENSION_NAME}_SUPERBUILD:BOOL=OFF
+    -D${LOCAL_PROJECT_NAME}_SUPERBUILD:BOOL=OFF
     -DEXTENSION_SUPERBUILD_BINARY_DIR:PATH=${${EXTENSION_NAME}_BINARY_DIR}
   INSTALL_COMMAND ""
   DEPENDS


Search for APRUtil and not APR

Search for APRUtil and not APR

--- src/gop/cmake/FindAPRUtil-ACCRE.cmake
+++ src/gop/cmake/FindAPRUtil-ACCRE.cmake
@@ -54,7 +54,7 @@
 list(GET APU_LIBTOOL 0 APU_LIBTOOL_ARG0)

 get_filename_component(APU_LIBTOOL_BASE ${APU_LIBTOOL_ARG0} PATH )
-FIND_LIBRARY(APU_LIBRARY NAMES apr-accre-1 aprutil-ACCRE-1 PATHS ${APU_LIBTOOL_BASE})
+FIND_LIBRARY(APU_LIBRARY NAMES aprutil-accre-1 aprutil-ACCRE-1 PATHS ${APU_LIBTOOL_BASE})

 # compatibility, allow this CMake module to work with the various CMakeList.txt files
 set(APRUTIL_INCLUDE_DIR "${APU_INCLUDES}")


ENH: Install Trafic executables

ENH: Install Trafic executables

--- AutoTract.cmake
+++ AutoTract.cmake
@@ -42,6 +42,34 @@
 find_package(QtToCppXML REQUIRED)
 include(${QtToCppXML_USE_FILE})

+find_package(Trafic)
+
+if(Trafic_FOUND)
+
+  foreach(Trafic_lib ${Trafic_LIBRARIES})
+
+    get_target_property(Trafic_location ${Trafic_lib} LOCATION_RELEASE)
+    if(NOT EXISTS ${Trafic_location})
+      message(STATUS "skipping niral_utilities_lib install rule: [${Trafic_location}] does not exist")
+      continue()
+    endif()
+
+    if(EXISTS "${Trafic_location}.xml")
+      install(PROGRAMS ${Trafic_location}
+        DESTINATION ${INSTALL_RUNTIME_DESTINATION}
+        COMPONENT RUNTIME)
+
+      install(FILES ${Trafic_location}.xml
+        DESTINATION ${INSTALL_RUNTIME_DESTINATION}
+        COMPONENT RUNTIME)
+    else()
+      install(PROGRAMS ${Trafic_location}
+        DESTINATION ${INSTALL_RUNTIME_DESTINATION}/../ExternalBin
+        COMPONENT RUNTIME)
+    endif()
+  endforeach()
+
+endif()

 set(ITK_IO_MODULES_USED


Some external libraries I am using were built only for dynamic linking.  Uncommented copying external dlls for now.  Ideally cmake-tools should support both static and dynamic linking of external libraries like it originally was supposed to.  (I had switched to what I thought was purely static because of dynamic linking complications).

--- scripts/project.cmake
+++ scripts/project.cmake
@@ -520,9 +520,9 @@

       doctor_dynamic(dllname ${fullpath})
       #      message(WARNING "${CURRENT_TARGET} ${fullpath}/${dllname}")
-#      add_custom_command(TARGET ${CURRENT_TARGET} POST_BUILD
-#        COMMAND ${CMAKE_COMMAND} -E copy ${fullpath}/${dllname} $<TARGET_FILE_DIR:${CURRENT_TARGET}>
-#        )
+      add_custom_command(TARGET ${CURRENT_TARGET} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy ${fullpath}/${dllname} $<TARGET_FILE_DIR:${CURRENT_TARGET}>
+        )
     endif ()
   endif ()
 endmacro()


Remove template file after generating source file on build

--- CMakeUnit.cmake
+++ CMakeUnit.cmake
@@ -582,7 +582,9 @@
           "file (READ \"${TMP_BINARY_DIR_LOCATION}\"\n"
           "      GENERATED_FILE_CONTENTS)\n"
           "file (WRITE \"${CMAKE_CURRENT_BINARY_DIR}/${NAME}\"\n"
-          "      \"\${GENERATED_FILE_CONTENTS}\")\n")
+          "      \"\${GENERATED_FILE_CONTENTS}\")\n"
+          "file (REMOVE \"${TMP_BINARY_DIR_LOCATION}\")\n"
+          "file (REMOVE \"${WRITE_SOURCE_FILE_SCRIPT}\")\n")

     # Generate target name, convert temporary location to lowercase.


Use SET_TARGET_PROPERTIES consistently

Use SET_TARGET_PROPERTIES consistently

Also make the INSTALL lines a little easier to read.

--- CMakeUnix.cmake
+++ CMakeUnix.cmake
@@ -19,12 +19,16 @@
 ADD_LIBRARY(mod_websocket MODULE mod_websocket.c)
 TARGET_LINK_LIBRARIES(mod_websocket ${APACHE_LIBRARY} ${APR_LIBRARY})

-SET_TARGET_PROPERTIES(mod_websocket PROPERTIES PREFIX "")
-SET_PROPERTY(TARGET mod_websocket PROPERTY C_STANDARD 11)
+SET_TARGET_PROPERTIES(mod_websocket
+                      PROPERTIES
+                        PREFIX     ""
+                        C_STANDARD 11)

 ## Install Targets
-INSTALL(TARGETS mod_websocket DESTINATION ${APACHE_MODULE_DIR})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/websocket.load DESTINATION ${APACHE_CONF_DIR}/mods-available)
+INSTALL(TARGETS mod_websocket
+        DESTINATION ${APACHE_MODULE_DIR})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/websocket.load
+        DESTINATION ${APACHE_CONF_DIR}/mods-available)

 ### Build Examples
 IF (BUILD_EXAMPLES)
@@ -35,11 +39,12 @@
   # Construct a target for each example
   FOREACH(modname ${example_targets})
     ADD_LIBRARY(${modname} MODULE examples/${modname}.c)
+  ENDFOREACH()

-    # properties
-    SET_TARGET_PROPERTIES(${modname} PROPERTIES PREFIX "")
-    SET_PROPERTY(TARGET ${modname} PROPERTY C_STANDARD 11)
-  ENDFOREACH()
+  SET_TARGET_PROPERTIES(${example_targets}
+                        PROPERTIES
+                          PREFIX     ""
+                          C_STANDARD 11)

   # Only the dumb-increment example needs APR.
   TARGET_LINK_LIBRARIES(mod_websocket_dumb_increment ${APR_LIBRARY})


fixed find by board component

fixed find by board component

--- cmake/FindBSP.cmake
+++ cmake/FindBSP.cmake
@@ -322,13 +322,13 @@
         target_link_libraries(BSP::STM32::${FAMILY}${CORE_C}::${BCOMP_U} INTERFACE BSP::STM32::${FAMILY}${CORE_C} CMSIS::STM32::${FAMILY}${CORE_C})
         target_include_directories(BSP::STM32::${FAMILY}${CORE_C}::${BCOMP_U} INTERFACE "${BSP_${FAMILY}_PATH}/Components/${BCOMP}")

-        find_file(BSP_${BOARD_CANONICAL}_${COMP}_SOURCE
+        find_file(BSP_${BOARD_CANONICAL}_${BCOMP}_SOURCE
             NAMES ${BCOMP}.c
             PATHS "${BSP_${FAMILY}_PATH}/Components/${BCOMP}"
             NO_DEFAULT_PATH
         )
-        if (BSP_${BOARD_CANONICAL}_${COMP}_SOURCE)
-            target_sources(BSP::STM32::${FAMILY}${CORE_C}::${BCOMP_U} INTERFACE "${BSP_${BOARD_CANONICAL}_${COMP}_SOURCE}")
+        if (BSP_${BOARD_CANONICAL}_${BCOMP}_SOURCE)
+            target_sources(BSP::STM32::${FAMILY}${CORE_C}::${BCOMP_U} INTERFACE "${BSP_${BOARD_CANONICAL}_${BCOMP}_SOURCE}")
         endif()
     endforeach()


Throw an error if no component is set for FindCAF

--- cmake/FindCAF.cmake
+++ cmake/FindCAF.cmake
@@ -2,7 +2,7 @@
 #
 # Use this module as follows:
 #
-#     find_package(CAF)
+#     find_package(CAF [COMPONENTS <core|io|opencl|...>*] [REQUIRED])
 #
 # Variables used by this module (they can change the default behaviour and need
 # to be set before calling find_package):
@@ -17,6 +17,10 @@
 #  CAF_INCLUDE_DIRS       List of include paths for all components
 #  CAF_LIBRARY_$C         Library file for component $C
 #  CAF_INCLUDE_DIR_$C     Include path for component $C
+
+if(CAF_FIND_COMPONENTS STREQUAL "")
+  message(FATAL_ERROR "FindCAF requires at least one COMPONENT.")
+endif()

 # iterate over user-defined components
 foreach (comp ${CAF_FIND_COMPONENTS})


Fixed naming issue in FindFMT.cmake

Fixed naming issue in FindFMT.cmake

--- cmake/FindFMT.cmake
+++ cmake/FindFMT.cmake
@@ -16,6 +16,6 @@
     HINTS $ENV{FMT_ROOT}/lib)

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(TCLAP DEFAULT_MSG FMT_LIBRARY FMT_INCLUDE_DIR)
+find_package_handle_standard_args(FMT DEFAULT_MSG FMT_LIBRARY FMT_INCLUDE_DIR)

 mark_as_advanced(FMT_INCLUDE_DIR)


Support INCLUDE_DIRECTORIES & COMPILE_DEFINITIONS

--- cmake/FindHIP.cmake
+++ cmake/FindHIP.cmake
@@ -22,6 +22,26 @@
 option(HIP_HOST_COMPILATION_CPP "Host code compilation mode" ON)
 option(HIP_VERBOSE_BUILD "Print out the commands run while compiling the HIP source file.  With the Makefile generator this defaults to VERBOSE variable specified on the command line, but can be forced on with this option." OFF)
 mark_as_advanced(HIP_HOST_COMPILATION_CPP)
+
+###############################################################################
+# Set HIP CMAKE Flags
+###############################################################################
+# Copy the invocation styles from CXX to HIP
+set(CMAKE_HIP_ARCHIVE_CREATE ${CMAKE_CXX_ARCHIVE_CREATE})
+set(CMAKE_HIP_ARCHIVE_FINISH ${CMAKE_CXX_ARCHIVE_FINISH})
+set(CMAKE_SHARED_LIBRARY_SONAME_HIP_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG})
+set(CMAKE_SHARED_LIBRARY_CREATE_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS})
+set(CMAKE_SHARED_LIBRARY_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
+set(CMAKE_SHARED_LIBRARY_LINK_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS})
+set(CMAKE_SHARED_LIBRARY_RUNTIME_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
+set(CMAKE_SHARED_LIBRARY_RUNTIME_HIP_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP})
+set(CMAKE_SHARED_LIBRARY_LINK_STATIC_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_STATIC_CXX_FLAGS})
+set(CMAKE_SHARED_LIBRARY_LINK_DYNAMIC_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_DYNAMIC_CXX_FLAGS})
+
+# Set the CMake Flags to use the HCC Compilier.
+set(CMAKE_HIP_CREATE_SHARED_LIBRARY "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_PATH} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+set(CMAKE_HIP_CREATE_SHARED_MODULE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_PATH} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <LINK_LIBRARIES> -shared" )
+set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_PATH} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")

 ###############################################################################
 # FIND: HIP and associated helper binaries
@@ -383,6 +403,10 @@
     HIP_PARSE_HIPCC_OPTIONS(HIP_HCC_FLAGS ${_hcc_options})
     HIP_PARSE_HIPCC_OPTIONS(HIP_NVCC_FLAGS ${_nvcc_options})

+    # Add the include directories && compile definitions
+    list(APPEND HIP_HIPCC_INCLUDE_ARGS_USER "-I$<JOIN:$<TARGET_PROPERTY:${_target},INCLUDE_DIRECTORIES>, -I>")
+    list(APPEND HIP_HIPCC_FLAGS "-D$<JOIN:$<TARGET_PROPERTY:${_target},COMPILE_DEFINITIONS>, -D>")
+
     # Check if we are building shared library.
     set(_hip_build_shared_libs FALSE)
     list(FIND _hip_cmake_options SHARED _hip_found_SHARED)
@@ -478,7 +502,7 @@
                 set(verbose_output ON)
             else()
                 set(verbose_output OFF)
-            endif()
+            endif()

             # Create up the comment string
             file(RELATIVE_PATH generated_file_relative_path "${CMAKE_BINARY_DIR}" "${generated_file}")


comment mhd debug for now

comment mhd debug for now

--- cmake/FindMHD.cmake
+++ cmake/FindMHD.cmake
@@ -53,9 +53,8 @@
 		DOC "mhd debug library"
 	)

-	set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
 	# not sure why this was commented
-	# always use release for now
+	# always use release for now, need to ask Arkadiy
 	#string(REPLACE ".lib" ".dll" MHD_DLL_DEBUG ${MHD_LIBRARY_DEBUG})
 	#set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})


Set ctest update command to git.

Set ctest update command to git.


Follow yiqun's comments

Follow yiqun's comments

--- cmake/generic.cmake
+++ cmake/generic.cmake
@@ -88,7 +88,7 @@
 #

 # including binary directory for generated headers.
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_BINARY_DIR})

 if(NOT APPLE)
     find_package(Threads REQUIRED)


Fixed if-branch error

Fixed if-branch error

git-svn-id: b66b41e514ff40863ef1aa95df2dbf63dd8d6be1@195 fdac6126-5c0c-442c-9429-916003d36597

--- cmake/package.cmake
+++ cmake/package.cmake
@@ -1,144 +1,144 @@
-# option to disable inclusion of qmake build system into source package
-option (
-  DISABLE_QMAKE_BUILD
-  "Disable inclusion of qmake build system into source package"
-  OFF
-)
-
-# set name
-set (CPACK_PACKAGE_NAME "OpenMesh")
-set (CPACK_PACKAGE_VENDOR "ACG")
-
-# set version
-set (CPACK_PACKAGE_VERSION_MAJOR "${OPENMESH_VERSION_MAJOR}")
-set (CPACK_PACKAGE_VERSION_MINOR "${OPENMESH_VERSION_MINOR}")
-set (CPACK_PACKAGE_VERSION_PATCH "${OPENMESH_VERSION_PATCH}")
-set (CPACK_PACKAGE_VERSION "${OPENMESH_VERSION}")
-
-# addition package info
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenMesh")
-set (CPACK_PACKAGE_EXECUTABLES "OpenMesh;")
-set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set (CPACK_SOURCE_STRIP_FILES "")
-
-# set (CPACK_STRIP_FILES "bin/OpenFlipper")
-
-# source package generation
-set (CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP")
-
-# ignored files in source package
-set (CPACK_SOURCE_IGNORE_FILES  "\\\\.#;/#;.*~")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/\\\\.git")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/\\\\.svn")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR}")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "Makefile")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "Makefile\\\\..*")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "\\\\.moc\\\\.cpp$")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
-
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*_(32|64)_Debug/")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*_(32|64)_Release/")
-
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/MacOS")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/WIN")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/tmp/")
-
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.kdevelop")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.kdevses")
-
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/ACG/lib/")
-list (APPEND CPACK_SOURCE_IGNORE_FILES "/ACG/include/")
-
-if (DISABLE_QMAKE_BUILD)
-  list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.pro")
-  list (APPEND CPACK_SOURCE_IGNORE_FILES "/qmake/")
-  list (APPEND CPACK_SOURCE_IGNORE_FILES "\\\\.qmake\\\\.cache")
-endif ()
-
-# filter out all disabled plugins
-# file (
-#   GLOB _plugins_in
-#   RELATIVE "${CMAKE_SOURCE_DIR}"
-#   "${CMAKE_SOURCE_DIR}/Plugin-*"
-# )
-#foreach (_plugin ${_plugins_in})
-#  string (REPLACE "Plugin-" "" _plugin_name ${_plugin})
-#  string (TOUPPER ${_plugin_name} _PLUGIN)
-#  if (NOT EXISTS ${CMAKE_SOURCE_DIR}/${_plugin}/CMakeLists.txt AND DISABLE_QMAKE_BUILD)
-#    list (APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_SOURCE_DIR}/${_plugin}")
-#  elseif (DISABLE_PLUGIN_${_PLUGIN})
-#    list (APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_SOURCE_DIR}/${_plugin}")
-#  endif ()
-#endforeach ()
-
-
-if (WIN32)
-  # window NSIS installer
-  set (CPACK_GENERATOR "NSIS")
-  set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-  set (CPACK_NSIS_DISPLAY_NAME "OpenMesh v${CPACK_PACKAGE_VERSION}")
-  # set (CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}\\\\OpenFlipper\\\\Icons\\\\OpenFlipper_Icon_128x128x32.ico")
-  # we need a real uninstaller icon here and we have to define both to make the installer icon work
-  # set (CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}\\\\OpenFlipper\\\\Icons\\\\OpenFlipper_Icon_128x128x32.ico")
-  # set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}\\\\OpenFlipper\\\\Icons\\\\installer.bmp")
-  set (CPACK_NSIS_HELP_LINK "http:\\\\www.openmesh.org")
-  set (CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.openmesh.org")
-  # TODO: fillme
-  # set (CPACK_NSIS_CONTACT "")
-
-  #set (CPACK_NSIS_CREATE_ICONS
-  #     "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\OpenFlipper.lnk\\\" \\\"$INSTDIR\\\\OpenFlipper.exe\\\""
-  #    )
-  #set (CPACK_NSIS_DELETE_ICONS
-  #     "Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\OpenFlipper.lnk\\\""
-  #    )
-
-  # append dll's to installed package
-  #if (EXISTS ${CMAKE_SOURCE_DIR}/WIN)
-	  #file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 debug/*.dll")
-	  #install(FILES ${_files}
-	  #DESTINATION ${ACG_PROJECT_BINDIR}
-	  #CONFIGURATIONS Debug
-	  #)
-    #file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 release/*.dll")
-    #install (FILES ${_files}
-    #  DESTINATION ${ACG_PROJECT_BINDIR}
-    #  CONFIGURATIONS Release
-    #)
-    #install (FILES "${CMAKE_SOURCE_DIR}/WIN/DLLs/Redistributables/Visual Studio 2008/vcredist_x86.exe"
-    #  DESTINATION ${ACG_PROJECT_BINDIR}
-    #)
-    #set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q:a'")
-    #endif ()
-    #elseif (APPLE)
-  # apple Drag'n'Drop installer package
-  #set (CPACK_GENERATOR "DragNDrop;TGZ")
-  #set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/OpenFlipper/Icons/OpenFlipper_Icon.icns")
-  #endif ()
-
-# has to be last
-if (WIN32)
-  set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP "true")
-  include (InstallRequiredSystemLibraries)
-  install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${ACG_PROJECT_BINDIR})
-else ()
-  include (InstallRequiredSystemLibraries)
-endif ()
-
-
-include (CPack)
-
-if (NOT WIN32 AND NOT APPLE)
-  # no binary target for linux
-  file (REMOVE "${CMAKE_BINARY_DIR}/CPackConfig.cmake")
-endif ()
-
-# cmake doesn't create a source package target, so we have to add our own
-if (EXISTS "${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake")
-  add_custom_target (PACKAGE_SOURCE
-    ${CMAKE_CPACK_COMMAND} --config "${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake"
-  )
-endif ()
+# option to disable inclusion of qmake build system into source package
+option (
+  DISABLE_QMAKE_BUILD
+  "Disable inclusion of qmake build system into source package"
+  OFF
+)
+
+# set name
+set (CPACK_PACKAGE_NAME "OpenMesh")
+set (CPACK_PACKAGE_VENDOR "ACG")
+
+# set version
+set (CPACK_PACKAGE_VERSION_MAJOR "${OPENMESH_VERSION_MAJOR}")
+set (CPACK_PACKAGE_VERSION_MINOR "${OPENMESH_VERSION_MINOR}")
+set (CPACK_PACKAGE_VERSION_PATCH "${OPENMESH_VERSION_PATCH}")
+set (CPACK_PACKAGE_VERSION "${OPENMESH_VERSION}")
+
+# addition package info
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenMesh")
+set (CPACK_PACKAGE_EXECUTABLES "OpenMesh;")
+set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+set (CPACK_SOURCE_STRIP_FILES "")
+
+# set (CPACK_STRIP_FILES "bin/OpenFlipper")
+
+# source package generation
+set (CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP")
+
+# ignored files in source package
+set (CPACK_SOURCE_IGNORE_FILES  "\\\\.#;/#;.*~")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/\\\\.git")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/\\\\.svn")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR}")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "Makefile")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "Makefile\\\\..*")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "\\\\.moc\\\\.cpp$")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
+
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*_(32|64)_Debug/")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*_(32|64)_Release/")
+
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/MacOS")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/WIN")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/tmp/")
+
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.kdevelop")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.kdevses")
+
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/ACG/lib/")
+list (APPEND CPACK_SOURCE_IGNORE_FILES "/ACG/include/")
+
+if (DISABLE_QMAKE_BUILD)
+  list (APPEND CPACK_SOURCE_IGNORE_FILES "/.*\\\\.pro")
+  list (APPEND CPACK_SOURCE_IGNORE_FILES "/qmake/")
+  list (APPEND CPACK_SOURCE_IGNORE_FILES "\\\\.qmake\\\\.cache")
+endif ()
+
+# filter out all disabled plugins
+# file (
+#   GLOB _plugins_in
+#   RELATIVE "${CMAKE_SOURCE_DIR}"
+#   "${CMAKE_SOURCE_DIR}/Plugin-*"
+# )
+#foreach (_plugin ${_plugins_in})
+#  string (REPLACE "Plugin-" "" _plugin_name ${_plugin})
+#  string (TOUPPER ${_plugin_name} _PLUGIN)
+#  if (NOT EXISTS ${CMAKE_SOURCE_DIR}/${_plugin}/CMakeLists.txt AND DISABLE_QMAKE_BUILD)
+#    list (APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_SOURCE_DIR}/${_plugin}")
+#  elseif (DISABLE_PLUGIN_${_PLUGIN})
+#    list (APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_SOURCE_DIR}/${_plugin}")
+#  endif ()
+#endforeach ()
+
+
+if (WIN32)
+  # window NSIS installer
+  set (CPACK_GENERATOR "NSIS")
+  set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+  set (CPACK_NSIS_DISPLAY_NAME "OpenMesh v${CPACK_PACKAGE_VERSION}")
+  # set (CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}\\\\OpenFlipper\\\\Icons\\\\OpenFlipper_Icon_128x128x32.ico")
+  # we need a real uninstaller icon here and we have to define both to make the installer icon work
+  # set (CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}\\\\OpenFlipper\\\\Icons\\\\OpenFlipper_Icon_128x128x32.ico")
+  # set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}\\\\OpenFlipper\\\\Icons\\\\installer.bmp")
+  set (CPACK_NSIS_HELP_LINK "http:\\\\www.openmesh.org")
+  set (CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.openmesh.org")
+  # TODO: fillme
+  # set (CPACK_NSIS_CONTACT "")
+
+  #set (CPACK_NSIS_CREATE_ICONS
+  #     "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\OpenFlipper.lnk\\\" \\\"$INSTDIR\\\\OpenFlipper.exe\\\""
+  #    )
+  #set (CPACK_NSIS_DELETE_ICONS
+  #     "Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\OpenFlipper.lnk\\\""
+  #    )
+
+  # append dll's to installed package
+  #if (EXISTS ${CMAKE_SOURCE_DIR}/WIN)
+	  #file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 debug/*.dll")
+	  #install(FILES ${_files}
+	  #DESTINATION ${ACG_PROJECT_BINDIR}
+	  #CONFIGURATIONS Debug
+	  #)
+    #file (GLOB _files "${CMAKE_SOURCE_DIR}/WIN/DLLs/DLLs 32 release/*.dll")
+    #install (FILES ${_files}
+    #  DESTINATION ${ACG_PROJECT_BINDIR}
+    #  CONFIGURATIONS Release
+    #)
+    #install (FILES "${CMAKE_SOURCE_DIR}/WIN/DLLs/Redistributables/Visual Studio 2008/vcredist_x86.exe"
+    #  DESTINATION ${ACG_PROJECT_BINDIR}
+    #)
+    #set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q:a'")
+    #endif ()
+    #elseif (APPLE)
+  # apple Drag'n'Drop installer package
+  #set (CPACK_GENERATOR "DragNDrop;TGZ")
+  #set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/OpenFlipper/Icons/OpenFlipper_Icon.icns")
+endif ()
+
+# has to be last
+if (WIN32)
+  set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP "true")
+  include (InstallRequiredSystemLibraries)
+  install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${ACG_PROJECT_BINDIR})
+else ()
+  include (InstallRequiredSystemLibraries)
+endif ()
+
+
+include (CPack)
+
+if (NOT WIN32 AND NOT APPLE)
+  # no binary target for linux
+  file (REMOVE "${CMAKE_BINARY_DIR}/CPackConfig.cmake")
+endif ()
+
+# cmake doesn't create a source package target, so we have to add our own
+if (EXISTS "${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake")
+  add_custom_target (PACKAGE_SOURCE
+    ${CMAKE_CPACK_COMMAND} --config "${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake"
+  )
+endif ()


Include kmf file in generated java project

Change-Id: Iabfcfe7204d6123b0b606b5b53f20e81856ce7cf

--- CMake/CodeGenerator.cmake
+++ CMake/CodeGenerator.cmake
@@ -522,6 +522,10 @@
       OUTPUT_VARIABLE PROCESSOR_OUTPUT
     )

+    execute_process(
+      COMMAND ${KTOOL_ROM_PROCESSOR_EXECUTABLE} -r ${PARAM_MODELS} -dr ${KURENTO_MODULES_DIR} -o ${CMAKE_BINARY_DIR}/java/src/main/kmd
+    )
+
     add_custom_target(java
       COMMAND ${Maven_EXECUTABLE} package
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/java


SK:

SK:

-ENH: update dashboard script to new cluster. The old cluster will be gone soon.

--- src/Testing/Dashboard/elxDashboard_BIGR_linux64_gcc.cmake
+++ src/Testing/Dashboard/elxDashboard_BIGR_linux64_gcc.cmake
@@ -12,13 +12,13 @@
 # NOTE that Model should directly follow the comma: no space allowed!
 #
 # Setup: linux 64bit
-# gcc 4.1.2 20061115 (prerelease) (SUSE Linux),
+# gcc 4.4.6 (Redhat Linux),
 # Release mode, ITK 4.1rc01
-# PC: linux cluster at BIGR (SK).
+# PC: linux cluster2 at BIGR (SK).

 # Client maintainer: s.klein@erasmusmc.nl
 set( CTEST_SITE "BIGR.cluster" )
-set( CTEST_BUILD_NAME "Linux-64bit-gcc4.1.2" )
+set( CTEST_BUILD_NAME "Linux-64bit-gcc4.4.6" )
 set( CTEST_BUILD_CONFIGURATION Release )
 set( CTEST_CMAKE_GENERATOR "Unix Makefiles" )

@@ -28,24 +28,24 @@
 # Specify the kind of dashboard to submit
 # default: Nightly
 SET( dashboard_model Nightly )
+SET( CTEST_BUILD_FLAGS "-j3" ) # parallel build for makefiles
+SET( CTEST_TEST_ARGS PARALLEL_LEVEL 3 ) # parallel testing
+
 IF( ${CTEST_SCRIPT_ARG} MATCHES Experimental )
   SET( dashboard_model Experimental )
-  # speed up the experimental build a bit:
-  set( CTEST_BUILD_FLAGS "-j2" ) # parallel build for makefiles
-  set( CTEST_TEST_ARGS PARALLEL_LEVEL 2 ) # parallel testing
 ELSEIF( ${CTEST_SCRIPT_ARG} MATCHES Continuous )
   SET( dashboard_model Continuous )
 ENDIF()

 # Output directory
-set( CTEST_DASHBOARD_ROOT "/home/sklein/tk/mydash/${CTEST_SCRIPT_NAME}.${dashboard_model}" )
+set( CTEST_DASHBOARD_ROOT "/cm/shared/apps/elastix/nightly" )

 #set(dashboard_do_memcheck 1)
 #set(dashboard_do_coverage 1)

 SET( dashboard_cache "
 // Which ITK to use
-ITK_DIR:PATH=/home/sklein/tk/itk/4.1rc01/release
+ITK_DIR:PATH=/cm/shared/apps/itk/4.1rc01/release

 // Some elastix settings, defining the configuration
 ELASTIX_BUILD_TESTING:BOOL=ON
@@ -54,8 +54,11 @@
 ELASTIX_USE_MEVISDICOMTIFF:BOOL=ON
 ELASTIX_IMAGE_DIMENSION:STRING=2;3;4
 ELASTIX_IMAGE_2D_PIXELTYPES:STRING=float
-ELASTIX_IMAGE_3D_PIXELTYPES:STRING=float
+ELASTIX_IMAGE_3D_PIXELTYPES:STRING=short;float
 ELASTIX_IMAGE_4D_PIXELTYPES:STRING=short
+
+// Install dir
+CMAKE_INSTALL_PREFIX:PATH=/cm/shared/apps/elastix/nightly/install

 // Compile all elastix components;
 USE_ALL_COMPONENTS:BOOL=ON


fixed file header found by findcyclopts

fixed file header found by findcyclopts

--- src/CMake/FindCYCLOPTS.cmake
+++ src/CMake/FindCYCLOPTS.cmake
@@ -7,7 +7,7 @@

 # if installed in a non-standard location,
 # the include directory must be added to the PATH variable
-FIND_PATH(CYCLOPTS_INCLUDE_DIR cyclopts/Variable.h
+FIND_PATH(CYCLOPTS_INCLUDE_DIR cyclopts/variable.h
   HINTS "${CYCLOPTS_INCLUDE_DIR}"
   HINTS "${CYCLOPTS_ROOT_DIR}"
   HINTS "${CYCLOPTS_ROOT_DIR}/include"


[CMake] tf_tests.cmake | Fix invalid entries

--- tensorflow/contrib/cmake/tf_tests.cmake
+++ tensorflow/contrib/cmake/tf_tests.cmake
@@ -156,7 +156,6 @@
     "${tensorflow_source_dir}/tensorflow/python/debug/wrappers/*_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/estimator/python/estimator/*_test.py"
     "${tensorflow_source_dir}/tensorflow/python/kernel_tests/*.py"
-    "${tensorflow_source_dir}/tensorflow/python/meta_graph_transform/*_test.py"
     "${tensorflow_source_dir}/tensorflow/python/ops/quantized_conv_ops_test.py"
     "${tensorflow_source_dir}/tensorflow/python/ops/quantized_ops_test.py"
     "${tensorflow_source_dir}/tensorflow/python/platform/build_info_test.py"
@@ -209,7 +208,6 @@
     "${tensorflow_source_dir}/tensorflow/python/saved_model/saved_model_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/image/python/kernel_tests/sparse_image_warp_test.py"
     # requires scipy
-    "${tensorflow_source_dir}/tensorflow/contrib/keras/python/keras/preprocessing/*_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/tfprof/python/tools/tfprof/pprof_profiler_test.py"
     "${tensorflow_source_dir}/tensorflow/contrib/image/python/kernel_tests/interpolate_spline_test.py"
     # Takes very long to run without sharding (defined in bazel build file).
@@ -267,10 +265,9 @@
       # Flaky because of local cluster creation.
       "${tensorflow_source_dir}/tensorflow/python/training/sync_replicas_optimizer_test.py"
       "${tensorflow_source_dir}/tensorflow/python/debug/lib/session_debug_grpc_test.py"
-      "${tensorflow_source_dir}tensorflow/python/training/localhost_cluster_performance_test.py"
+      "${tensorflow_source_dir}/tensorflow/python/training/localhost_cluster_performance_test.py"
       "${tensorflow_source_dir}/tensorflow/python/data/kernel_tests/iterator_ops_cluster_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/functional_ops_test.py"
-      "${tensorflow_source_dir}/tensorflow/contrib/data/python/kernel_tests/iterator_ops_cluster_test.py"
       # Type error in testRemoteIteratorUsingRemoteCallOpDirectSessionGPUCPU.
       "${tensorflow_source_dir}/tensorflow/python/data/kernel_tests/iterator_ops_test.py"
       "${tensorflow_source_dir}/tensorflow/python/kernel_tests/self_adjoint_eig_op_test.py"


- Remove accidental CMake message

- Remove accidental CMake message

--- toolchain/cmake/Find/Findassimp.cmake
+++ toolchain/cmake/Find/Findassimp.cmake
@@ -28,8 +28,6 @@

     NO_CMAKE_FIND_ROOT_PATH
     )
-
-message ( "${CMAKE_LIBRARY_ARCHITECTURE} ${NATIVE_LIBRARY_DIR}" )

 FIND_LIBRARY(
     IRRXML_LIBRARIES_TMP


COMP: User proper BatchMake library Cmake variable

--- DTIReg.cmake
+++ DTIReg.cmake
@@ -30,7 +30,7 @@
 include(${ITK_USE_FILE})

 #-----------------------------------------------------------------------------
-find_package(BatchMake )
+find_package(BatchMake REQUIRED)
 include(${BatchMake_USE_FILE})

 #-----------------------------------------------------------------------------
@@ -48,7 +48,7 @@
 GenerateCLP(DTIReg_SOURCE DTI-Reg.xml)

 add_executable( DTI-Reg ${DTIReg_SOURCE} )
-target_link_libraries(DTI-Reg ${ITK_LIBRARIES} BatchMakeLib)
+target_link_libraries(DTI-Reg ${ITK_LIBRARIES} ${BatchMak_LIBRARIES})

 install(TARGETS DTI-Reg DESTINATION ${INSTALL_RUNTIME_DESTINATION} )


Remove deleted files from CMake

Remove deleted files from CMake

PiperOrigin-RevId: 176524446

--- tensorflow/contrib/cmake/tf_core_kernels.cmake
+++ tensorflow/contrib/cmake/tf_core_kernels.cmake
@@ -55,10 +55,6 @@
       "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/utils/sparse_column_iterable.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/utils/tensor_utils.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/learner/common/partitioners/example_partitioner.cc"
-      "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/learner/stochastic/handlers/bias-feature-column-handler.cc"
-      "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/learner/stochastic/handlers/categorical-feature-column-handler.cc"
-      "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/learner/stochastic/handlers/dense-quantized-feature-column-handler.cc"
-      "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/learner/stochastic/handlers/sparse-quantized-feature-column-handler.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/models/multiple_additive_trees.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/lib/trees/decision_tree.cc"
       "${tensorflow_source_dir}/tensorflow/contrib/boosted_trees/ops/model_ops.cc"


removed unnecessary MOC declaration of new header

--- Modules/Overlays/files.cmake
+++ Modules/Overlays/files.cmake
@@ -9,7 +9,6 @@

 SET(MOC_H_FILES
-  QmitkCustomWidgetOverlay.h
   QmitkOverlay.h
   QmitkOverlayController.h
   QmitkScalarBar.h


Removed unused variable

Removed unused variable

--- Testing/CTestConfig.cmake
+++ Testing/CTestConfig.cmake
@@ -7,8 +7,6 @@
 set(CTEST_PROJECT_NAME "OTB")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")

-set(CTEST_NIGHTLY_IDENT_LOCATION "http://host2.orfeo-toolbox.org/nightly/libNightlyNumber")
-
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=OTB")


xct/make/arch_define.cmake: updated PYTHONPATH

FASM_TO_BIT_CMD calls a prjxray script which imports the textx library.
This strangely generates a "library not found". I have explicitly added
the textx library to PYTHONPATH.

Signed-off-by: Alessandro Comodi <622632e70fd6771cf2cd943f69e5e51ab66adef8@antmicro.com>

--- xc7/make/arch_define.cmake
+++ xc7/make/arch_define.cmake
@@ -42,7 +42,7 @@
     BIN_EXTENSION bit
     FASM_TO_BIT ${PRJXRAY_DIR}/utils/fasm2frames.py
     FASM_TO_BIT_CMD "${CMAKE_COMMAND} -E env \
-    PYTHONPATH=${PRJXRAY_DIR}:${PRJXRAY_DIR}/third_party/fasm \
+    PYTHONPATH=${symbiflow-arch-defs_BINARY_DIR}/env/conda/lib/python3.7/site-packages:${PRJXRAY_DIR}:${PRJXRAY_DIR}/third_party/fasm \
     \${PYTHON3} \${FASM_TO_BIT} \
 	  --db-root ${PRJXRAY_DB_DIR}/${ARCH} \
     --sparse \


Increment minor mode whatever RELEASE_CANDIDATE is on.

	* build-aux/cmake/modules/ProjectInfo.cmake: Here.

--- build-aux/cmake/modules/ProjectInfo.cmake
+++ build-aux/cmake/modules/ProjectInfo.cmake
@@ -193,9 +193,9 @@
 	set(minor 0)
       elseif(PROJECT_VERSION_MAJOR EQUAL ${major})
 	if(NOT n EQUAL 0)
-	  if(NOT RELEASE_CANDIDATE AND rc EQUAL 0)
+	  if(rc EQUAL 0)
  	    math(EXPR minor "${minor} + 1")
-	  endif(NOT RELEASE_CANDIDATE AND rc EQUAL 0)
+	  endif(rc EQUAL 0)
 	endif(NOT n EQUAL 0)
       else(PROJECT_VERSION_MAJOR GREATER ${major})
 	message(SEND_ERROR


cmake: v2x: set INCLUDE_FILES property in generated xml targets

Signed-off-by: Karol Gugala <38af71640571ee4b5093d4f69ffca1ac454f2948@antmicro.com>

--- make/gen.cmake
+++ make/gen.cmake
@@ -31,6 +31,8 @@
   set(INCLUDES "")

   set(DEPENDS_LIST "")
+  set(MODEL_INCLUDE_FILES "")
+  set(PB_TYPE_INCLUDE_FILES "")
   get_target_property_required(PYTHON3 env PYTHON3)
   get_target_property(PYTHON3_TARGET env PYTHON3_TARGET)
   list(APPEND DEPENDS_LIST ${PYTHON3} ${PYTHON3_TARGET})
@@ -60,6 +62,8 @@

       append_file_dependency(DEPENDS_LIST ${INCLUDE_SRC_DIR}/${INCLUDE_ROOT}.model.xml)
       append_file_dependency(DEPENDS_LIST ${INCLUDE_SRC_DIR}/${INCLUDE_ROOT}.pb_type.xml)
+      list(APPEND MODEL_INCLUDE_FILES ${INCLUDE_SRC_DIR}/${INCLUDE_ROOT}.model.xml)
+      list(APPEND PB_TYPE_INCLUDE_FILES ${INCLUDE_SRC_DIR}/${INCLUDE_ROOT}.pb_type.xml)
     endforeach()
   endforeach()

@@ -97,6 +101,8 @@
   )

   add_file_target(FILE "${V2X_NAME}.pb_type.xml" GENERATED)
+  get_file_target(SRC_TARGET_NAME "${V2X_NAME}.pb_type.xml")
+  set_target_properties(${SRC_TARGET_NAME} PROPERTIES INCLUDE_FILES "${PB_TYPE_INCLUDE_FILES}")

   add_custom_command(
     OUTPUT "${V2X_NAME}.model.xml"
@@ -111,6 +117,8 @@
   )

   add_file_target(FILE "${V2X_NAME}.model.xml" GENERATED)
+  get_file_target(SRC_TARGET_NAME "${V2X_NAME}.model.xml")
+  set_target_properties(${SRC_TARGET_NAME} PROPERTIES INCLUDE_FILES "${MODEL_INCLUDE_FILES}")

   add_custom_target(
     ${V2X_NAME}


- updated FindMaya

- updated FindMaya

--- dev/cmake/FindMaya.cmake
+++ dev/cmake/FindMaya.cmake
@@ -78,7 +78,7 @@
 		SET( MAYA_DEFINITIONS "${MAYA_DEFINITIONS} -D_GNU_SOURCE -DCC_GNU_ -D_LANGUAGE_C_PLUS_PLUS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -funsigned-char" )

 		SET( CMAKE_CXX_FLAGS
-		  "-fno-gnu-keywords"
+		  "${CMAKE_CXX_FLAGS} -fno-gnu-keywords"
 		  )

 		SET( OS_LIBRARIES "" )


Pull in fixes to support retina display on macOS

--- versions.cmake
+++ versions.cmake
@@ -92,7 +92,7 @@
   set(_paraview_revision "master")
 else()
   # Test the revision with OpenGL2 rendering before updating, update often!
-  set(_paraview_revision "4a120bdae2e15fef46370711e223145bdf915e8c")
+  set(_paraview_revision "a46eaca267da6b23ea906c4aa0a28078da57aecc")
 endif()
 add_revision(paraview
   GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"


Updated to SDK version in order to support latest docbook on OS X

--- Doc/CMake/FindDocBook.cmake
+++ Doc/CMake/FindDocBook.cmake
@@ -6,16 +6,15 @@
 #                             on the docbook file
 # DOCBOOK_BUILD_SPELLCHECK  = option whether or not to add aspell check

-# We need to locate ourself. See xmldepend.xsl file
-get_filename_component(
-  DocBook_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+# We need to locate ourselves. See xmldepend.xsl file
+get_filename_component(DocBook_CURRENT_LIST_DIR
+  ${CMAKE_CURRENT_LIST_FILE} PATH)

 # This option allows generation of HTML pages
 option(DOCBOOK_BUILD_HTML "Build HTML?" ON)

-# This option allows generation of XHTML pages
-#option(DOCBOOK_BUILD_XHTML "Build XHTML?" OFF)
-#mark_as_advanced(DOCBOOK_BUILD_XHTML)
+# This option allows generation of HTML pages
+option(DOCBOOK_BUILD_SINGLE_HTML "Build Single HTML?" OFF)

 # This option allows generation of PDF document
 option(DOCBOOK_BUILD_PDF "Build PDF?" OFF)
@@ -24,7 +23,21 @@
 option(DOCBOOK_BUILD_VALIDATION "Build Validation Target?" OFF)

 option(DOCBOOK_BUILD_SPELLCHECK "Build Spell Check Target? (Experimental)" OFF)
-mark_as_advanced(DOCBOOK_BUILD_SPELLCHECK)
+
+# ------------- Docbook slides -------------------------
+# This option allows generation of HTML pages
+option(DOCBOOK_SLIDES_BUILD_HTML "Build Slides HTML?" ON)
+
+# This option allows generation of PDF document
+option(DOCBOOK_SLIDES_BUILD_PDF "Build Slides PDF?" OFF)
+
+# This option allows validation of DTD of docbook document (advanced user)
+option(DOCBOOK_SLIDES_BUILD_VALIDATION "Build Slides Validation Target?" OFF)
+
+option(DOCBOOK_SLIDES_BUILD_SPELLCHECK "Build Slides Spell Check Target? (Experimental)" OFF)
+
+# This option allows generation of PDF document
+option(DOCBOOK_SLIDES_BUILD_SPEAKERNOTES "Build Speakernotes for Slides Dockbook? (Pdf Only)" OFF)

 option(DOCBOOK_USE_SYNTAX_HIGHLIGHTING "Build Syntax Highlighting ? (Experimental)" OFF)
 mark_as_advanced(DOCBOOK_USE_SYNTAX_HIGHLIGHTING)
@@ -84,27 +97,46 @@
     XML_COMMONS_RESOLVER_JAR
     XML_COMMONS_RESOLVER_CATALOGMANAGER_PROPERTIES_PATH
     )
-endif(DOCBOOK_USE_SYNTAX_HIGHLIGHTING)
-
-if(DOCBOOK_BUILD_HTML)
+endif()
+
+if(DOCBOOK_BUILD_HTML OR DOCBOOK_BUILD_SINGLE_HTML OR DOCBOOK_SLIDES_BUILD_HTML)
   # apt-get install xsltproc
   find_program(XSLTPROC_EXECUTABLE xsltproc)
+
+  if(APPLE)
+    file(GLOB brewPath /usr/local/Cellar/docbook/*/docbook/xsl/*/html
+      /usr/local/Cellar/docbook-xsl/*/docbook-xsl/html)
+  else()
+    set(brewPath)
+  endif()
+
   find_path(DOCBOOK_HTML_XSL_DIRECTORY docbook.xsl
     /usr/share/xml/docbook/stylesheet/docbook-xsl/html/
     # I know this distro customization sucks but the following line is for
     # Fedora12 to work (rpm package is declined with the version number i.e.
     # docbook-style-xsl-1.75.2-4.fc12.noarch):
-    /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/html/
+    /usr/share/sgml/docbook/xsl-stylesheets-1.76.1/html/
+    /usr/share/sgml/docbook/xsl-stylesheets-1.78.1/html/
     # ubuntu
     /usr/share/xml/docbook/stylesheet/nwalsh/html/
     # Mac when using port to install the docbook-xml and docbook-xsl packages
     # alternatively, docbook is in the dependency of dia,
     /opt/local/share/xsl/docbook-xsl/html
+    # mac with homebrew
+    ${brewPath}
     ${DOCBOOK_HTML_XSL_DIRECTORY}
     )
   set(DOCBOOK_HTML_XSL ${DOCBOOK_HTML_XSL_DIRECTORY}/docbook.xsl)
   set(DOCBOOK_HTML_CHUNK_XSL ${DOCBOOK_HTML_XSL_DIRECTORY}/chunk.xsl)
   set(DOCBOOK_HTML_CHUNKFAST_XSL ${DOCBOOK_HTML_XSL_DIRECTORY}/chunkfast.xsl)
+
+  find_path(DOCBOOK_SLIDES_HTML_XSL_DIRECTORY tables.xsl
+    /usr/share/xml/docbook/custom/slides/*/xsl/html/
+    /usr/share/xml/docbook/stylesheet/docbook-xsl/slides/html/
+    /opt/local/share/xsl/docbook-xsl/slides/html/
+    ${DOCBOOK_SLIDES_HTML_XSL_DIRECTORY})
+  set(DOCBOOK_SLIDES_HTML_XSL ${DOCBOOK_SLIDES_HTML_XSL_DIRECTORY}/tables.xsl)
+
   get_filename_component(
     DOCBOOK_XSL_DIRECTORY
     ${DOCBOOK_HTML_XSL_DIRECTORY}/..
@@ -113,18 +145,43 @@

   if(DOCBOOK_USE_SYNTAX_HIGHLIGHTING)
     set(DOCBOOK_HIGHLIGHT_HTML_XSL ${DOCBOOK_HTML_XSL_DIRECTORY}/highlight.xsl)
-    set(DOCBOOK_IMPORT_HTML_SYNTAX_HIGHLIGHTING "<xsl:import href=\"${DOCBOOK_HIGHLIGHT_HTML_XSL}\"/>")
-  endif(DOCBOOK_USE_SYNTAX_HIGHLIGHTING)
+    if(WIN32)
+      string(REGEX REPLACE " " "%20" treatedPath "${DOCBOOK_HIGHLIGHT_HTML_XSL}")
+      set(DOCBOOK_IMPORT_HTML_SYNTAX_HIGHLIGHTING "<xsl:import href=\"${treatedPath}\"/>")
+    else()
+      set(DOCBOOK_IMPORT_HTML_SYNTAX_HIGHLIGHTING "<xsl:import href=\"${DOCBOOK_HIGHLIGHT_HTML_XSL}\"/>")
+    endif()
+  endif()
+
+  if(DOCBOOK_BUILD_SINGLE_HTML)
+    if(WIN32)
+      string(REGEX REPLACE " " "%20" treatedPath "${DOCBOOK_HTML_XSL}")
+      set(DOCBOOK_IMPORT_SINGLE_HTML "<xsl:import href=\"${treatedPath}\"/>")
+    else()
+      set(DOCBOOK_IMPORT_SINGLE_HTML "<xsl:import href=\"${DOCBOOK_HTML_XSL}\"/>")
+    endif()
+  endif()
+
+  if(DOCBOOK_BUILD_HTML)
+    if(WIN32)
+      string(REGEX REPLACE " " "%20" treatedPath "${DOCBOOK_HTML_CHUNKFAST_XSL}")
+      set(DOCBOOK_IMPORT_CHUNKED_HTML "<xsl:import href=\"${treatedPath}\"/>")
+    else()
+      set(DOCBOOK_IMPORT_CHUNKED_HTML "<xsl:import href=\"${DOCBOOK_HTML_CHUNKFAST_XSL}\"/>")
+    endif()
+  endif()
+
   mark_as_advanced(
     XSLTPROC_EXECUTABLE
     DOCBOOK_HTML_XSL_DIRECTORY
+    DOCBOOK_SLIDES_HTML_XSL_DIRECTORY
   )
   find_package_handle_standard_args(DocBook
     "DocBook/HTML could not be found"
     XSLTPROC_EXECUTABLE
     DOCBOOK_HTML_XSL_DIRECTORY
     )
-endif(DOCBOOK_BUILD_HTML)
+endif()

 #if(DOCBOOK_BUILD_XHTML)
 #  find_program(XSLTPROC_EXECUTABLE xsltproc)
@@ -145,34 +202,57 @@
 #    XSLTPROC_EXECUTABLE
 #    DOCBOOK_XHTML_XSL_DIRECTORY
 #    )
-#endif(DOCBOOK_BUILD_XHTML)
-
-if(DOCBOOK_BUILD_PDF)
+#endif()
+
+if(DOCBOOK_BUILD_PDF OR DOCBOOK_SLIDES_BUILD_PDF)
   find_program(XSLTPROC_EXECUTABLE xsltproc)
   # apt-get install fop
   find_program(FOP_EXECUTABLE fop)
+
+  if(APPLE)
+    file(GLOB brewPath /usr/local/Cellar/docbook/*/docbook/xsl/*/fo
+      /usr/local/Cellar/docbook-xsl/*/docbook-xsl/fo)
+  else()
+    set(brewPath)
+  endif()
   find_path(DOCBOOK_FO_XSL_DIRECTORY docbook.xsl
     /usr/share/xml/docbook/stylesheet/docbook-xsl/fo/
     /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/fo/
+    #fedora
+    /usr/share/sgml/docbook/xsl-stylesheets-1.76.1/fo
+    /usr/share/sgml/docbook/xsl-stylesheets-1.78.1/fo
     # older ubuntu:
     /usr/share/xml/docbook/stylesheet/nwalsh/fo/
     # mac when installed with port
     /opt/local/share/xsl/docbook-xsl/fo
+    # mac with homebrew
+    ${brewPath}
     )
   set(DOCBOOK_FO_XSL ${DOCBOOK_FO_XSL_DIRECTORY}/docbook.xsl)
+
+  find_path(DOCBOOK_SLIDES_FO_XSL_DIRECTORY plain.xsl
+    /usr/share/xml/docbook/custom/slides/*/xsl/fo/
+    /usr/share/xml/docbook/stylesheet/docbook-xsl/slides/fo/
+    /opt/local/share/xsl/docbook-xsl/slides/fo/
+    # fedora
+    /usr/share/xml/docbook/slides/*/xsl/fo
+    ${DOCBOOK_SLIDES_FO_XSL_DIRECTORY})
+  set(DOCBOOK_SLIDES_FO_XSL ${DOCBOOK_SLIDES_FO_XSL_DIRECTORY}/plain.xsl)
+
   if(NOT DOCBOOK_XSL_DIRECTORY)
     get_filename_component(
       DOCBOOK_XSL_DIRECTORY
       ${DOCBOOK_FO_XSL_DIRECTORY}/..
       ABSOLUTE
       )
-  endif(NOT DOCBOOK_XSL_DIRECTORY)
+  endif()
   if(DOCBOOK_USE_SYNTAX_HIGHLIGHTING)
     set(DOCBOOK_HIGHLIGHT_FO_XSL ${DOCBOOK_FO_XSL_DIRECTORY}/highlight.xsl)
     set(DOCBOOK_IMPORT_FO_SYNTAX_HIGHLIGHTING "<xsl:import href=\"${DOCBOOK_HIGHLIGHT_FO_XSL}\"/>")
-  endif(DOCBOOK_USE_SYNTAX_HIGHLIGHTING)
+  endif()
   mark_as_advanced(
     DOCBOOK_FO_XSL_DIRECTORY
+    DOCBOOK_SLIDES_FO_XSL_DIRECTORY
     FOP_EXECUTABLE
     XSLTPROC_EXECUTABLE
   )
@@ -186,7 +266,7 @@
       "DocBook/pdfopt could not be found"
       PDFOPT_EXECUTABLE
       )
-  endif(DOCBOOK_OPTIMIZE_PDF)
+  endif()
   find_package_handle_standard_args(DocBook
     "DocBook/PDF could not be found"
     DOCBOOK_FO_XSL_DIRECTORY
@@ -198,15 +278,25 @@
     mark_as_advanced(
       SAXON_XSLT_EXECUTABLE
       )
-  endif(DOCBOOK_USE_SAXON)
-endif(DOCBOOK_BUILD_PDF)
-
-#if(DOCBOOK_BUILD_VALIDATION)
-  # need xmllint: LIBXML2_XMLLINT_EXECUTABLE in all cases since it generates the full trace (XIncluded files)
-  find_package(LibXml2 REQUIRED)
-#endif(DOCBOOK_BUILD_VALIDATION)
-
-if(DOCBOOK_BUILD_SPELLCHECK)
+  endif()
+
+  # the package jlatexmath is required here
+  find_package(JLatexMath REQUIRED)
+  # setup the FOP_HYPHENATION_PATH environment variable to be given later to fop. It points to the location in memory of
+  # the jlatexmath-fop plugin
+  if(WIN32)
+    # on windows, the environment variable FOP_HYPHENATION_PATH will be set up by the externals installer
+    set(FOP_HYPHENATION_PATH "")
+  else()
+    # on other platforms, the variable must be set up here
+    set(FOP_HYPHENATION_PATH "FOP_HYPHENATION_PATH=${JLATEXMATH_JAR_PATH}")
+  endif()
+endif()
+
+# need xmllint: LIBXML2_XMLLINT_EXECUTABLE in all cases since it generates the full trace (XIncluded files)
+find_package(LibXml2 REQUIRED)
+
+if(DOCBOOK_BUILD_SPELLCHECK OR DOCBOOK_SLIDES_BUILD_SPELLCHECK)
   #find_package(ASPELL REQUIRED) # only search for lib/include
   # apt-get install aspell aspell-en
   find_program(ASPELL_EXECUTABLE aspell)
@@ -217,22 +307,23 @@
     "DocBook/aspell could not be found"
     ASPELL_EXECUTABLE
     )
-endif(DOCBOOK_BUILD_SPELLCHECK)
+endif()

 # Do the dia part:
 if(WIN32)
   find_program(DIA_EXECUTABLE dia PATHS "C:/Program Files (x86)/Dia/Bin" "C:/Program Files/Dia/Bin")
 else()
+  # Dia.app is not usable from the command line
+  set(tmp ${CMAKE_FIND_APPBUNDLE})
+  set(CMAKE_FIND_APPBUNDLE NEVER)
   find_program(DIA_EXECUTABLE dia)
-endif()
-mark_as_advanced(
-  DIA_EXECUTABLE
-  )
+  # revert to the default behavior
+  set(CMAKE_FIND_APPBUNDLE ${tmp})
+endif()
+mark_as_advanced(DIA_EXECUTABLE)
 find_package_handle_standard_args(DocBook
   "DocBook/dia could not be found"
   DIA_EXECUTABLE
   )

 set(DocBook_USE_FILE ${DocBook_CURRENT_LIST_DIR}/UseDocBook.cmake)
-
-


fix cmake typo

fix cmake typo

--- CMakeModules/PythonBindingsUtils.cmake
+++ CMakeModules/PythonBindingsUtils.cmake
@@ -22,7 +22,7 @@

 # Trick gccxml to ignore some compiler intrinsics that are used in Boost.Atomic
 # in Boost 1.55.
-if(CMAKE_COMPILER_IS_GNUCXX AND BOOST_VERSION VERSION_GREATER "1.54.0")
+if(CMAKE_COMPILER_IS_GNUCXX AND Boost_VERSION VERSION_GREATER "1.54.0")
     set(PYOMPL_EXTRA_CFLAGS "${PYOMPL_EXTRA_CFLAGS} -DBOOST_INTEL_CXX_VERSION")
 endif()


Added support for FBGallery

Added support for FBGallery

--- ThirdPartyLibraries.cmake
+++ ThirdPartyLibraries.cmake
@@ -178,6 +178,7 @@
 add_target(EIGEN eigen)
 add_target(EXTRAE extrae)
 add_target(FAST_IMAGE_CACHE fast_image_cache)
+add_target(FB_GALLERY fb_gallery)
 add_target(FLEX flex)
 add_target(FREETYPE freetype)
 add_target(G2LOG g2log)
@@ -327,6 +328,7 @@
 set_libraries(diff_match_patch ${DIFF_MATCH_PATCH_PREFIX}/lib diff_match_patch)
 set_libraries(dlib ${DLIB_PREFIX}/lib dlib)
 set_libraries(fast_image_cache ${FAST_IMAGE_CACHE_PREFIX}/lib fast_image_cache)
+set_libraries(fb_gallery ${FB_GALLERY_PREFIX}/lib fb_gallery)
 set_libraries(flex ${FLEX_PREFIX}/lib fl)
 set_libraries(freetype ${FREETYPE_PREFIX}/lib freetype)
 set_libraries(g2log ${G2LOG_PREFIX}/lib lib_activeobject lib_g2logger)
@@ -647,6 +649,7 @@
 set_include_directories(dlib ${DLIB_PREFIX}/include)
 set_include_directories(eigen ${EIGEN_INCLUDE_PATH})
 set_include_directories(fast_image_cache ${FAST_IMAGE_CACHE_PREFIX}/include)
+set_include_directories(fb_gallery ${FB_GALLERY_PREFIX}/include)
 set_include_directories(flex ${FLEX_PREFIX}/include)
 set_include_directories(freetype ${FREETYPE_PREFIX}/include)
 set_include_directories(g2log ${G2LOG_PREFIX}/include)
@@ -1391,6 +1394,39 @@
     LIBRARY_OUTPUT_DIRECTORY ${FAST_IMAGE_CACHE_PREFIX}/lib
     OUTPUT_NAME fast_image_cache)
 add_dependencies(${FAST_IMAGE_CACHE_TARGET} ${FAST_IMAGE_CACHE_TARGET}_download)
+
+################################################################################
+# FBGallery.
+set(DOWNLOAD_TARGET ${FB_GALLERY_TARGET}_download)
+add_external_project(
+  ${DOWNLOAD_TARGET}
+  PREFIX ${FB_GALLERY_PREFIX}
+  DOWNLOAD_COMMAND
+      ${GIT} clone --depth 1 git://github.com/Seitk/FB-Gallery.git
+          ${DOWNLOAD_TARGET}
+  CONFIGURE_COMMAND ${NOP}
+  BUILD_COMMAND ${NOP}
+  INSTALL_COMMAND
+    cd "<SOURCE_DIR>/FB Gallery" &&
+    find . -maxdepth 1 -name "*.h" |
+        cpio -dp ${FB_GALLERY_PREFIX}/include/FBGallery)
+ExternalProject_Get_Property(${DOWNLOAD_TARGET} SOURCE_DIR)
+set(SOURCE_DIR "${SOURCE_DIR}/FB Gallery")
+set(SRCS
+    "${SOURCE_DIR}/FBGTimelineCell.m"
+    "${SOURCE_DIR}/FBGTimelinePhotoView.m"
+    "${SOURCE_DIR}/UIView+viewController.m")
+set_source_files_properties(${SRCS} PROPERTIES GENERATED TRUE)
+objc_library(${FB_GALLERY_TARGET} ${SRCS})
+set_target_properties(
+    ${FB_GALLERY_TARGET} PROPERTIES
+    ARCHIVE_OUTPUT_DIRECTORY ${FB_GALLERY_PREFIX}/lib
+    LIBRARY_OUTPUT_DIRECTORY ${FB_GALLERY_PREFIX}/lib
+    OUTPUT_NAME fb_gallery)
+target_include_directories(
+    ${FB_GALLERY_TARGET} PUBLIC ${MW_PHOTO_BROWSER_PREFIX}/include)
+add_dependencies(${FB_GALLERY_TARGET} ${DOWNLOAD_TARGET})
+add_dependencies(${FB_GALLERY_TARGET} ${MW_PHOTO_BROWSER_TARGET})

 ################################################################################
 # Flex.


Update UseBoost.cmake

Update UseBoost.cmake

Getting ridiculous now.

--- Superbuild/UseBoost.cmake
+++ Superbuild/UseBoost.cmake
@@ -33,21 +33,20 @@
   if(CMAKE_GENERATOR MATCHES "Makefiles" AND CMAKE_BUILD_TYPE MATCHES "Debug")
     set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
   elseif(CMAKE_GENERATOR MATCHES "Makefiles")
-    set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}-x64${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    if(${lib} MATCHES "boost_python-mt")
+      set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt-x64${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    else()
+      set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}-x64${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    endif()
   else()
     if(${lib} MATCHES "boost_python-mt")
       if(WIN32)
 		    set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${CMAKE_STATIC_LIBRARY_SUFFIX}")
         set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-      else(WIN32)
-        if (${USER_PYTHON_VERSION} VERSION_GREATER "3.7")
-          set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${CMAKE_STATIC_LIBRARY_SUFFIX}")
-          set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-        else()
-          set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python3-mt${CMAKE_STATIC_LIBRARY_SUFFIX}")
-          set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python3-mt${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-        endif()
-      endif(WIN32)
+      else()
+        set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${CMAKE_STATIC_LIBRARY_SUFFIX}")
+        set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+      endif()
 	  else() # non-python libraries
 	    set(FULL_LIB_NAME_RELEASE "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}")
 	    set(FULL_LIB_NAME_DEBUG "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")


[FIX]

[FIX]

git-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@13888 e6417c60-b987-48fd-844e-b20f0fcc1017

--- util/cmake/SeqAnUsabilityAnalyzer.cmake
+++ util/cmake/SeqAnUsabilityAnalyzer.cmake
@@ -46,17 +46,17 @@
   endif (NOT SEQAN_INSTRUMENTATION)

   message(STATUS "Prepare SeqAn Usability Analyzer data collection...")
-  if (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
-    # Use EXE for instrumentation with bundled Python runtime.
-    execute_process (COMMAND ${CMAKE_SOURCE_DIR}/misc/seqan_instrumentation/py2exe/dist/seqan_instrumentation.exe cmake ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-    add_custom_target (seqan_sua_target ${CMAKE_SOURCE_DIR}/misc/seqan_instrumentation/py2exe/dist/seqan_instrumentation.exe build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}
-                       COMMENT "Build Instrumentation...")
-  else (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
+#  if (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
+#    # Use EXE for instrumentation with bundled Python runtime.
+#    execute_process (COMMAND ${CMAKE_SOURCE_DIR}/misc/seqan_instrumentation/py2exe/dist/seqan_instrumentation.exe cmake ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+#    add_custom_target (seqan_sua_target ${CMAKE_SOURCE_DIR}/misc/seqan_instrumentation/py2exe/dist/seqan_instrumentation.exe build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}
+#                       COMMENT "Build Instrumentation...")
+#  else (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
     # Use system's Python runtime.
     execute_process (COMMAND ${PYTHON_EXECUTABLE} ${SEQAN_ROOT_SOURCE_DIR}/misc/seqan_instrumentation/bin/seqan_instrumentation.py cmake ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
     add_custom_target (seqan_sua_target ${PYTHON_EXECUTABLE} ${SEQAN_ROOT_SOURCE_DIR}/misc/seqan_instrumentation/bin/seqan_instrumentation.py build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}
                        COMMENT "Build Instrumentation...")
-  endif (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
+#  endif (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
 endfunction (seqan_setup_sua)

 # ---------------------------------------------------------------------------
@@ -74,17 +74,17 @@
   add_dependencies (${TARGET} seqan_sua_target)

   # Add hooks before and after building.
-  if (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
-    set (_INST ${CMAKE_SOURCE_DIR}/misc/seqan_instrumentation/py2exe/dist/seqan_instrumentation.exe)
-    add_custom_command (TARGET ${TARGET}
-                        PRE_BUILD
-                        COMMAND ${_INST} pre_build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TARGET}
-                        COMMENT "Pre Build Instrumentation...")
-    add_custom_command (TARGET ${TARGET}
-                        POST_BUILD
-                        COMMAND ${_INST} post_build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TARGET}
-                        COMMENT "Post Build Instrumentation...")
-  else (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
+#  if (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
+#    set (_INST ${CMAKE_SOURCE_DIR}/misc/seqan_instrumentation/py2exe/dist/seqan_instrumentation.exe)
+#    add_custom_command (TARGET ${TARGET}
+#                        PRE_BUILD
+#                        COMMAND ${_INST} pre_build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TARGET}
+#                        COMMENT "Pre Build Instrumentation...")
+#    add_custom_command (TARGET ${TARGET}
+#                        POST_BUILD
+#                        COMMAND ${_INST} post_build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TARGET}
+#                        COMMENT "Post Build Instrumentation...")
+#  else (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
     set (_INST ${PYTHON_EXECUTABLE} ${SEQAN_ROOT_SOURCE_DIR}/misc/seqan_instrumentation/bin/seqan_instrumentation.py)
     add_custom_command (TARGET ${TARGET}
                         PRE_BUILD
@@ -94,5 +94,5 @@
                         POST_BUILD
                         COMMAND ${_INST} post_build ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${TARGET}
                         COMMENT "Post Build Instrumentation...")
-  endif (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
+#  endif (CMAKE_HOST_WIN32 AND NOT PYTHON_EXECUTABLE)
 endfunction (seqan_add_sua_dependency TARGET)


Fixed xml library path

Fixed xml library path

--- ThirdPartyLibraries.cmake
+++ ThirdPartyLibraries.cmake
@@ -351,8 +351,10 @@
 set_libraries(libcxxabi ${LIBCXXABI_PREFIX}/lib c++abi)
 set_libraries(libffi ${LIBFFI_PREFIX}/lib ffi)
 set_libraries(libpng ${LIBPNG_PREFIX}/lib png)
-if (NOT IS_IOS)
+if (IS_IOS)
   set_libraries(libxml ${CMAKE_IOS_SDK_ROOT}/usr/lib xml2)
+else ()
+  set_libraries(libxml ${LIBXML_PREFIX}/lib xml2)
 endif ()
 set_libraries(llvm_aarch64_asm_parser ${LLVM_LIB_DIR} LLVMAArch64AsmParser)
 set_libraries(llvm_aarch64_asm_printer ${LLVM_LIB_DIR} LLVMAArch64AsmPrinter)


COMP: fix paths so Python can be used to calculate dependencies - running python this way now works on mac, and should work on other platforms as well.

--- CMake/ctkMacroWrapPythonQt.cmake
+++ CMake/ctkMacroWrapPythonQt.cmake
@@ -99,18 +99,20 @@
     MESSAGE(SEND_ERROR "PYTHONQTGENERATOR_EXECUTABLE not specified or inexistent when calling ctkMacroWrapPythonQt")
   ENDIF()

+  # TODO: this find package seems not to work when called form a superbuild, but the call is needed
+  # in general to find the python interpreter.  In CTK, the toplevel CMakeLists.txt does the find
+  # package so this is a no-op.  Other uses of this file may need to have this call so it is still enabled.
   find_package(PythonInterp)
   IF(NOT PYTHONINTERP_FOUND)
     MESSAGE(SEND_ERROR "PYTHON_EXECUTABLE not specified or inexistent when calling ctkMacroWrapPythonQt")
   ENDIF()

-  find_package(PythonLibs)
-  IF(NOT PYTHONLIBS_FOUND)
-    MESSAGE(SEND_ERROR "PYTHON_LIBRARY not specified or inexistent when calling ctkMacroWrapPythonQt")
-  ENDIF()
-
   # Extract python lib path
-  get_filename_component(PYTHON_LIBRARY_PATH ${PYTHON_LIBRARY} PATH)
+  get_filename_component(PYTHON_DIR_PATH ${PYTHON_EXECUTABLE} PATH)
+  set(PYTHON_LIBRARY_PATH ${PYTHON_DIR_PATH}/../lib)
+  IF(WIN32)
+    set(PYTHON_LIBRARY_PATH ${PYTHON_DIR_PATH}/../bin)
+  ENDIF(WIN32)

   # Clear log file
   FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ctkMacroWrapPythonQt_log.txt" "")


COMP: bug in cmakemodules dir from external projects

--- CMake/otbGenerateOTBConfig.cmake
+++ CMake/otbGenerateOTBConfig.cmake
@@ -74,7 +74,7 @@
 SET(OTB_BINARY_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_BIN_DIR}")

 # Package directories (cmake files...)
-SET(OTB_CMAKEMODULE_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}")
+SET(OTB_CMAKEMODULE_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_CMAKEMODULE_DIR}")

 #-----------------------------------------------------------------------------
 # Configure OTBConfig.cmake for the INSTALL tree.


ThriftCppLibrary.cmake: fixup deps

ThriftCppLibrary.cmake: fixup deps

Summary:
this adds the include and library dirs for generated thrift targets;
these are important when those dependencies are not installed into a default
prefix.

Reviewed By: strager

Differential Revision: D14683957

fbshipit-source-id: ed47ffac5c8732810afe77e6947584b7a2f05155

--- build/fbcode_builder/CMake/ThriftCppLibrary.cmake
+++ build/fbcode_builder/CMake/ThriftCppLibrary.cmake
@@ -107,11 +107,14 @@
     PUBLIC
       ${CMAKE_SOURCE_DIR}
       ${CMAKE_BINARY_DIR}
+      ${FOLLY_INCLUDE_DIR}
+      ${FBTHRIFT_INCLUDE_DIR}
   )
   target_link_libraries(
     ${LIB_NAME}
     PUBLIC
       ${DEPENDS}
       FBThrift::thriftcpp2
+      Folly::folly
   )
 endfunction()


Add arcane boost compile flags to find zlib and ignore bzip2

--- boost.cmake
+++ boost.cmake
@@ -10,6 +10,9 @@
 include (ExternalSource)

 include (python)
+include (zlib)
+
+include_directories (${FLYEM_BUILD_DIR}/include)

 external_source (boost
     1_51_0
@@ -18,13 +21,13 @@

 message ("Installing ${boost_NAME} into FlyEM build area: ${FLYEM_BUILD_DIR} ...")
 ExternalProject_Add(${boost_NAME}
-    DEPENDS ${python_NAME}
+    DEPENDS ${python_NAME} ${zlib_NAME}
     PREFIX ${FLYEM_BUILD_DIR}
     URL ${boost_URL}
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
     CONFIGURE_COMMAND ./bootstrap.sh --with-python=${PYTHON_EXE} --prefix=${FLYEM_BUILD_DIR}
-    BUILD_COMMAND ./b2 install
+    BUILD_COMMAND ./b2 -sNO_BZIP2=1 -sZLIB_INCLUDE=${FLYEM_BUILD_DIR}/include -sZLIB_SOURCE=${zlib_SRC_DIR} install
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND ""
 )


Revert "[CMake] [macho_embedded] Check to make sure the compiler supports the architectures before generating build targets"

This commit reverts r252525. I was not really thinking about this fix properly. This doesn't work because it relys on try_compile checks which do a full compile & link. I'm going to put in a temporary solution as an interm step until we have a way to perform compiler checks without linking.

git-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@252569 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/Modules/CompilerRTDarwinUtils.cmake
+++ cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -364,19 +364,7 @@
   set(PIC_FLAG -fPIC)
   set(STATIC_FLAG -static)

-  darwin_test_archs(ios
-      DARWIN_macho_embedded_ios_ARCHS
-      armv6m armv7m armv7em armv7)
-  darwin_test_archs(osx
-      DARWIN_macho_embedded_osx_ARCHS
-      i386 x86_64)
-
-  list(APPEND DARWIN_macho_embedded_ARCHS
-    ${DARWIN_macho_embedded_ios_ARCHS} ${DARWIN_macho_embedded_osx_ARCHS})
-
-  if(NOT DARWIN_macho_embedded_ARCHS)
-    return()
-  endif()
+  set(DARWIN_macho_embedded_ARCHS armv6m armv7m armv7em armv7 i386 x86_64)

   set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR
     ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded)


Add CTestConfig.cmake

Add CTestConfig.cmake

--- CTestConfig.cmake
+++ CTestConfig.cmake
@@ -1,12 +1,15 @@
+## This file should be placed in the root directory of your project.
+## Then modify the CMakeLists.txt file in the root directory of your
+## project to incorporate the testing dashboard.
+##
+## # The following are required to submit to the CDash dashboard:
+##   ENABLE_TESTING()
+##   INCLUDE(CTest)
+
 set(CTEST_PROJECT_NAME "dsncompat")
 set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")

-if(NOT DEFINED CTEST_DROP_METHOD)
-  set(CTEST_DROP_METHOD "http")
-endif(NOT DEFINED CTEST_DROP_METHOD)
-
-if(CTEST_DROP_METHOD STREQUAL "http")
-  set(CTEST_DROP_SITE "harpy.png.das-system.vpn")
-  set(CTEST_DROP_LOCATION "/cdash/submit.php?project=dsncompat")
-  set(CTEST_TRIGGER_SITE "http://${CTEST_DROP_SITE}/")
-endif(CTEST_DROP_METHOD STREQUAL "http")
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "cdash.das-system-networks.de")
+set(CTEST_DROP_LOCATION "/submit.php?project=dsncompat")
+set(CTEST_DROP_SITE_CDASH TRUE)


Fix the MIC Mask ABI test

Fix the MIC Mask ABI test

Signed-off-by: Matthias Kretz <372ea4eca737a13cd010ee806d4ce7b98ee71550@kde.org>


Buildroot.cmake: Fix check for overwriting Buildroot Makefile

Buildroot.cmake once lived inside a fork of the Buildroot tree itself,
which is why that code assumed that it could overwrite Buildroot's
Makefile in this way.

--- Buildroot.cmake
+++ Buildroot.cmake
@@ -25,7 +25,7 @@
 include("support/cmake/EnsureAllArgumentsParsed")
 include("support/cmake/FindArtifactFile")

-if(("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") AND
+if(("${BUILDROOT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") AND
     ("${CMAKE_GENERATOR}" STREQUAL "Unix Makefiles"))
     message(FATAL_ERROR "Please run CMake with a work directory that is not "
                         "the top of the repo. Otherwise, the generated "


tweak cmake module search path order

tweak cmake module search path order

--- CMakeModules/FindlibSquish.cmake
+++ CMakeModules/FindlibSquish.cmake
@@ -3,8 +3,8 @@
 #  LIBSQUISH_INCLUDE_DIR
 #  LIBSQUISH_LIBRARIES

-FIND_PATH(LIBSQUISH_INCLUDE_DIR squish.h PATHS . .. squish ../squish DOC "Directory containing libSquish headers")
-FIND_LIBRARY(LIBSQUISH_LIBRARY NAMES squish libsquish PATHS . .. squish ../squish DOC "Path to libSquish library")
+FIND_PATH(LIBSQUISH_INCLUDE_DIR squish.h PATHS . squish .. ../squish DOC "Directory containing libSquish headers")
+FIND_LIBRARY(LIBSQUISH_LIBRARY NAMES squish libsquish PATHS . squish .. ../squish DOC "Path to libSquish library")

 SET(LIBSQUISH_LIBRARIES ${LIBSQUISH_LIBRARY})


Fix regex for extraction of macOS codename

--- CMake/MITKDashboardScript.download.cmake
+++ CMake/MITKDashboardScript.download.cmake
@@ -14,7 +14,7 @@
   if(EXISTS "${software_license_file}")
     file(READ "${software_license_file}" software_license)

-    if(software_license MATCHES "SOFTWARE LICENSE AGREEMENT FOR macOS ([^\n]+)")
+    if(software_license MATCHES "SOFTWARE LICENSE AGREEMENT FOR macOS ([^\\\n]+)")
       set(macos_codename "${CMAKE_MATCH_1}")
     endif()
   endif()


cmake: set Zephyr_DIR when loading Zephyr package

CMake find_package() is expected to set the cached variable Zephyr_DIR
with the value of the package included.

Zephyr_DIR in the CMakeCache is used by CMake re-runs for
`find_package(Zephyr)` to directly lookup the package to use.

The Zephyr_DIR is set correctly when a single Zephyr workspace is used
but may in some other cases be set to `Zephyr_DIR=Zephyr_DIR-NOTFOUND`.
This causes CMake to rerun the Zephyr package search mechanism and loop
through potential candidates before loading the correct Zephyr
installation.
After a second run, Zephyr_DIR is n some cases set to
`Zephyr_DIR=<path-to-including-Zephyr>` which might be different from
the Zephyr in use.

The Zephyr_DIR should be pointing to the package defined by ZEPHYR_BASE.

This commit ensures that when ZephyrConfig.cmake package is loaded, then
Zephyr_DIR is set correctly.

Signed-off-by: Torsten Rasmussen <a7c5b1d5a1f41fce6edfa3f7c2392ae0c59deafe@nordicsemi.no>

--- share/zephyr-package/cmake/ZephyrConfig.cmake
+++ share/zephyr-package/cmake/ZephyrConfig.cmake
@@ -11,6 +11,9 @@
 # It will be empty if not set in environment.

 macro(include_boilerplate location)
+  set(Zephyr_DIR ${ZEPHYR_BASE}/share/zephyr-package/cmake CACHE PATH
+      "The directory containing a CMake configuration file for Zephyr." FORCE
+  )
   list(PREPEND CMAKE_MODULE_PATH ${ZEPHYR_BASE}/cmake/modules)
   if(ZEPHYR_UNITTEST)
     message(WARNING "The ZephyrUnittest CMake package has been deprecated.\n"


COMP: wrong OpenCV md5sum

COMP: wrong OpenCV md5sum

--- SuperBuild/CMake/External_opencv.cmake
+++ SuperBuild/CMake/External_opencv.cmake
@@ -35,7 +35,7 @@
 ExternalProject_Add(OPENCV
   PREFIX OPENCV
   URL "https://github.com/opencv/opencv/archive/2.4.13.2.tar.gz"
-  URL_MD5 8feb45a71adad89b8017a777477c3eff
+  URL_MD5 fe52791ce523681a67036def4c25261b
   BINARY_DIR ${OPENCV_SB_BUILD_DIR}
   INSTALL_DIR ${SB_INSTALL_PREFIX}
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}


Fix wrappers

Fix wrappers

--- Examples/Build/vtkMy/vtkMy.cmake
+++ Examples/Build/vtkMy/vtkMy.cmake
@@ -7,7 +7,7 @@
 IF (USE_VTK_FILE)
   INCLUDE (${USE_VTK_FILE})
 ELSE (USE_VTK_FILE)
-  MESSAGE("Error, unable to find VTK, please edit your CMakeCache.txt file to specify the correct location of your VTK build")
+  MESSAGE("Error. Unable to find VTK, please edit your CMakeCache.txt file to specify the correct location of your VTK build.")
   SET (VTKMY_CAN_BUILD 0)
 ENDIF (USE_VTK_FILE)

@@ -20,6 +20,11 @@

 SET (EXECUTABLE_OUTPUT_PATH ${VTKMY_BINARY_DIR}/bin/ CACHE PATH
      "Single output directory for building all executables.")
+
+MARK_AS_ADVANCED(
+  LIBRARY_OUTPUT_PATH
+  EXECUTABLE_OUTPUT_PATH
+)

 #
 # Build shared libs ?
@@ -36,22 +41,144 @@
 #
 # Rational: even if your VTK was wrapped, it does not mean that you want to
 # wrap your own local classes.
+# Default value is OFF as the VTK cache might have set them to ON but the wrappers
+# might not be present (or yet not found).
 #

+#
+# Tcl
+#
+
 IF (VTK_WRAP_TCL)
+
   OPTION(VTKMY_WRAP_TCL
-         "Wrap classes into the TCL intepreted language."
-         ${VTK_WRAP_TCL})
+         "Wrap classes into the TCL interpreted language."
+         OFF)
+
+  IF (VTKMY_WRAP_TCL)
+
+    IF (NOT VTK_WRAP_TCL_EXE)
+
+      MESSAGE("Error. Unable to find VTK_WRAP_TCL_EXE, please edit this value to specify the correct location of the VTK Tcl wrapper.")
+      MARK_AS_ADVANCED(CLEAR VTK_WRAP_TCL_EXE)
+      SET (VTKMY_CAN_BUILD 0)
+
+    ELSE (NOT VTK_WRAP_TCL_EXE)
+
+      FIND_FILE (VTK_WRAP_HINTS hints ${VTKMY_SOURCE_DIR}/Wrapping)
+      MARK_AS_ADVANCED(VTK_WRAP_HINTS)
+
+      IF (USE_INSTALLED_VTK)
+        INCLUDE (${CMAKE_ROOT}/Modules/FindTCL.cmake)
+      ENDIF (USE_INSTALLED_VTK)
+
+      IF (TCL_INCLUDE_PATH)
+        INCLUDE_DIRECTORIES(${TCL_INCLUDE_PATH})
+      ENDIF (TCL_INCLUDE_PATH)
+
+    ENDIF (NOT VTK_WRAP_TCL_EXE)
+  ENDIF (VTKMY_WRAP_TCL)
 ENDIF (VTK_WRAP_TCL)

+#
+# Python
+#
+
+IF (VTK_WRAP_PYTHON)
+
+  OPTION(VTKMY_WRAP_PYTHON
+         "Wrap classes into the Python interpreted language."
+         OFF)
+
+  IF (VTKMY_WRAP_PYTHON)
+
+    IF (NOT VTK_WRAP_PYTHON_EXE)
+
+      MESSAGE("Error. Unable to find VTK_WRAP_PYTHON_EXE, please edit this value to specify the correct location of the VTK Python wrapper.")
+      MARK_AS_ADVANCED(CLEAR VTK_WRAP_PYTHON_EXE)
+      SET (VTKMY_CAN_BUILD 0)
+
+    ELSE (NOT VTK_WRAP_PYTHON_EXE)
+
+      FIND_FILE(VTK_WRAP_HINTS hints ${VTKMY_SOURCE_DIR}/Wrapping )
+      MARK_AS_ADVANCED(VTK_WRAP_HINTS)
+
+      IF (USE_INSTALLED_VTK)
+        INCLUDE (${CMAKE_ROOT}/Modules/FindPythonLibs.cmake)
+      ENDIF (USE_INSTALLED_VTK)
+
+      IF (PYTHON_INCLUDE_PATH)
+        INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+      ENDIF (PYTHON_INCLUDE_PATH)
+
+      IF (WIN32)
+        IF (NOT BUILD_SHARED_LIBS)
+          MESSAGE("Error. Python support requires BUILD_SHARED_LIBS to be ON.")
+          SET (VTKMY_CAN_BUILD 0)
+        ENDIF (NOT BUILD_SHARED_LIBS)
+      ENDIF (WIN32)
+
+    ENDIF (NOT VTK_WRAP_PYTHON_EXE)
+  ENDIF (VTKMY_WRAP_PYTHON)
+ENDIF (VTK_WRAP_PYTHON)
+
+#
+# Java
+#
+
 IF (VTK_WRAP_JAVA)
+
   OPTION(VTKMY_WRAP_JAVA
-         "Wrap classes into the Java intepreted language."
-         ${VTK_WRAP_JAVA})
+         "Wrap classes into the Java interpreted language."
+         OFF)
+
+  IF (VTKMY_WRAP_JAVA)
+
+    IF (NOT VTK_WRAP_JAVA_EXE)
+      MESSAGE("Error. Unable to find VTK_WRAP_JAVA_EXE, please edit this value to specify the correct location of the VTK Java wrapper.")
+      MARK_AS_ADVANCED(CLEAR VTK_WRAP_JAVA_EXE)
+      SET (VTKMY_CAN_BUILD 0)
+    ENDIF (NOT VTK_WRAP_JAVA_EXE)
+
+    IF (NOT VTK_PARSE_JAVA_EXE)
+      MESSAGE("Error. Unable to find VTK_PARSE_JAVA_EXE, please edit this value to specify the correct location of the VTK Java parser.")
+      MARK_AS_ADVANCED(CLEAR VTK_PARSE_JAVA_EXE)
+      SET (VTKMY_CAN_BUILD 0)
+    ENDIF (NOT VTK_PARSE_JAVA_EXE)
+
+    IF (VTK_WRAP_JAVA_EXE AND VTK_PARSE_JAVA_EXE)
+
+      FIND_FILE(VTK_WRAP_HINTS hints ${VTKMY_SOURCE_DIR}/Wrapping )
+      MARK_AS_ADVANCED(VTK_WRAP_HINTS)
+
+      IF (USE_INSTALLED_VTK)
+        INCLUDE (${CMAKE_ROOT}/Modules/FindJNI.cmake)
+      ENDIF (USE_INSTALLED_VTK)
+
+      IF (JAVA_INCLUDE_PATH)
+        INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH})
+      ENDIF (JAVA_INCLUDE_PATH)
+
+      IF (JAVA_INCLUDE_PATH2)
+        INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH2})
+      ENDIF (JAVA_INCLUDE_PATH2)
+
+      IF (JAVA_AWT_INCLUDE_PATH)
+        INCLUDE_DIRECTORIES(${JAVA_AWT_INCLUDE_PATH})
+      ENDIF (JAVA_AWT_INCLUDE_PATH)
+
+      IF (NOT VTK_JAVA_HOME)
+        SET (VTK_JAVA_HOME ${VTKMY_BINARY_DIR}/java/vtk CACHE PATH "Path to Java install")
+      ENDIF (NOT VTK_JAVA_HOME)
+
+      IF (WIN32)
+        IF (NOT BUILD_SHARED_LIBS)
+          MESSAGE("Error. Java support requires BUILD_SHARED_LIBS to be ON.")
+          SET (VTKMY_CAN_BUILD 0)
+        ENDIF (NOT BUILD_SHARED_LIBS)
+      ENDIF (WIN32)
+
+    ENDIF (VTK_WRAP_JAVA_EXE AND VTK_PARSE_JAVA_EXE)
+  ENDIF (VTKMY_WRAP_JAVA)
 ENDIF (VTK_WRAP_JAVA)

-IF (VTK_WRAP_PYTHON)
-  OPTION(VTKMY_WRAP_PYTHON
-         "Wrap classes into the Python intepreted language."
-         ${VTK_WRAP_PYTHON})
-ENDIF (VTK_WRAP_PYTHON)


ENH: Changed nightly start time

ENH: Changed nightly start time

--- DartConfig.cmake
+++ DartConfig.cmake
@@ -1,3 +1,7 @@
+# Dashboard is opened for submissions for a 24 hour period starting at
+# the specified NIGHLY_START_TIME. Time is specified in 24 hour format.
+SET (NIGHTLY_START_TIME "1:00:00 EST")
+
 # Dart server to submit results (used by client)
 SET (DROP_SITE "public.kitware.com")
 SET (DROP_LOCATION "/incoming")