[Build] Added full support for SEvMgr, TraDemGen, TravelCCM, AirSched, AvlCal, SimFQT, SimLFS and SimCRS.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -590,6 +590,134 @@

 endmacro (get_stdair)

+# ~~~~~~~~~~ SEvMgr ~~~~~~~~~
+macro (get_sevmgr)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires SEvMgr-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires SEvMgr without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (SEvMgr ${_required_version} REQUIRED
+	HINTS ${WITH_SEVMGR_PREFIX})
+  if (SEvMgr_FOUND)
+    #
+    message (STATUS "Found SEvMgr version: ${SEVMGR_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${SEVMGR_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${SEVMGR_LIBRARIES})
+
+  else (SEvMgr_FOUND)
+    set (ERROR_MSG "The SEvMgr library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_SEVMGR_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<SEvMgr install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (SEvMgr_FOUND)
+
+endmacro (get_sevmgr)
+
+# ~~~~~~~~~~ TraDemGen ~~~~~~~~~
+macro (get_trademgen)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires TraDemGen-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires TraDemGen without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (TraDemGen ${_required_version} REQUIRED
+	HINTS ${WITH_TRADEMGEN_PREFIX})
+  if (TraDemGen_FOUND)
+    #
+    message (STATUS "Found TraDemGen version: ${TRADEMGEN_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${TRADEMGEN_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${TRADEMGEN_LIBRARIES})
+
+  else (TraDemGen_FOUND)
+    set (ERROR_MSG "The TraDemGen library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_TRADEMGEN_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<TraDemGen install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (TraDemGen_FOUND)
+
+endmacro (get_trademgen)
+
+# ~~~~~~~~~~ TravelCCM ~~~~~~~~~
+macro (get_travelccm)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires TravelCCM-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires TravelCCM without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (TravelCCM ${_required_version} REQUIRED
+	HINTS ${WITH_TRAVELCCM_PREFIX})
+  if (TravelCCM_FOUND)
+    #
+    message (STATUS "Found TravelCCM version: ${TRAVELCCM_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${TRAVELCCM_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${TRAVELCCM_LIBRARIES})
+
+  else (TravelCCM_FOUND)
+    set (ERROR_MSG "The TravelCCM library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_TRAVELCCM_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<TravelCCM install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (TravelCCM_FOUND)
+
+endmacro (get_travelccm)
+
+# ~~~~~~~~~~ AirSched ~~~~~~~~~
+macro (get_airsched)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires AirSched-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires AirSched without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (AirSched ${_required_version} REQUIRED
+	HINTS ${WITH_AIRSCHED_PREFIX})
+  if (AirSched_FOUND)
+    #
+    message (STATUS "Found AirSched version: ${AIRSCHED_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${AIRSCHED_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${AIRSCHED_LIBRARIES})
+
+  else (AirSched_FOUND)
+    set (ERROR_MSG "The AirSched library cannot be found. If it is installed")
+    set (ERROR_MSG "${ERROR_MSG} in a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_AIRSCHED_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<AirSched install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (AirSched_FOUND)
+
+endmacro (get_airsched)
+
 # ~~~~~~~~~~ AirRAC ~~~~~~~~~
 macro (get_airrac)
   unset (_required_version)
@@ -654,21 +782,21 @@

 endmacro (get_rmol)

-# ~~~~~~~~~~ Airinv ~~~~~~~~~
+# ~~~~~~~~~~ AirInv ~~~~~~~~~
 macro (get_airinv)
   unset (_required_version)
   if (${ARGC} GREATER 0)
     set (_required_version ${ARGV0})
-    message (STATUS "Requires Airinv-${_required_version}")
+    message (STATUS "Requires AirInv-${_required_version}")
   else (${ARGC} GREATER 0)
-    message (STATUS "Requires Airinv without specifying any version")
+    message (STATUS "Requires AirInv without specifying any version")
   endif (${ARGC} GREATER 0)

-  find_package (Airinv ${_required_version} REQUIRED
+  find_package (AirInv ${_required_version} REQUIRED
 	HINTS ${WITH_AIRINV_PREFIX})
-  if (Airinv_FOUND)
+  if (AirInv_FOUND)
     #
-    message (STATUS "Found Airinv version: ${AIRINV_VERSION}")
+    message (STATUS "Found AirInv version: ${AIRINV_VERSION}")

     # Update the list of include directories for the project
     include_directories (${AIRINV_INCLUDE_DIRS})
@@ -676,15 +804,143 @@
     # Update the list of dependencies for the project
     set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${AIRINV_LIBRARIES})

-  else (Airinv_FOUND)
-    set (ERROR_MSG "The Airinv library cannot be found. If it is installed in")
+  else (AirInv_FOUND)
+    set (ERROR_MSG "The AirInv library cannot be found. If it is installed in")
     set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
     set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_AIRINV_PREFIX=")
-    set (ERROR_MSG "${ERROR_MSG}<Airinv install path> variable.")
+    set (ERROR_MSG "${ERROR_MSG}<AirInv install path> variable.")
     message (FATAL_ERROR "${ERROR_MSG}")
-  endif (Airinv_FOUND)
+  endif (AirInv_FOUND)

 endmacro (get_airinv)
+
+# ~~~~~~~~~~ AvlCal ~~~~~~~~~
+macro (get_avlcal)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires AvlCal-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires AvlCal without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (AvlCal ${_required_version} REQUIRED
+	HINTS ${WITH_AVLCAL_PREFIX})
+  if (AvlCal_FOUND)
+    #
+    message (STATUS "Found AvlCal version: ${AVLCAL_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${AVLCAL_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${AVLCAL_LIBRARIES})
+
+  else (AvlCal_FOUND)
+    set (ERROR_MSG "The AvlCal library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_AVLCAL_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<AvlCal install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (AvlCal_FOUND)
+
+endmacro (get_avlcal)
+
+# ~~~~~~~~~~ SimFQT ~~~~~~~~~
+macro (get_simfqt)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires SimFQT-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires SimFQT without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (SimFQT ${_required_version} REQUIRED
+	HINTS ${WITH_SIMFQT_PREFIX})
+  if (SimFQT_FOUND)
+    #
+    message (STATUS "Found SimFQT version: ${SIMFQT_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${SIMFQT_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${SIMFQT_LIBRARIES})
+
+  else (SimFQT_FOUND)
+    set (ERROR_MSG "The SimFQT library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_SIMFQT_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<SimFQT install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (SimFQT_FOUND)
+
+endmacro (get_simfqt)
+
+# ~~~~~~~~~~ SimLFS ~~~~~~~~~
+macro (get_simlfs)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires SimLFS-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires SimLFS without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (SimLFS ${_required_version} REQUIRED
+	HINTS ${WITH_SIMLFS_PREFIX})
+  if (SimLFS_FOUND)
+    #
+    message (STATUS "Found SimLFS version: ${SIMLFS_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${SIMLFS_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${SIMLFS_LIBRARIES})
+
+  else (SimLFS_FOUND)
+    set (ERROR_MSG "The SimLFS library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_SIMLFS_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<SimLFS install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (SimLFS_FOUND)
+
+endmacro (get_simlfs)
+
+# ~~~~~~~~~~ SimCRS ~~~~~~~~~
+macro (get_simcrs)
+  unset (_required_version)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires SimCRS-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires SimCRS without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  find_package (SimCRS ${_required_version} REQUIRED
+	HINTS ${WITH_SIMCRS_PREFIX})
+  if (SimCRS_FOUND)
+    #
+    message (STATUS "Found SimCRS version: ${SIMCRS_VERSION}")
+
+    # Update the list of include directories for the project
+    include_directories (${SIMCRS_INCLUDE_DIRS})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${SIMCRS_LIBRARIES})
+
+  else (SimCRS_FOUND)
+    set (ERROR_MSG "The SimCRS library cannot be found. If it is installed in")
+    set (ERROR_MSG "${ERROR_MSG} a in a non standard directory, just invoke")
+    set (ERROR_MSG "${ERROR_MSG} 'cmake' specifying the -DWITH_SIMCRS_PREFIX=")
+    set (ERROR_MSG "${ERROR_MSG}<SimCRS install path> variable.")
+    message (FATAL_ERROR "${ERROR_MSG}")
+  endif (SimCRS_FOUND)
+
+endmacro (get_simcrs)

 ##############################################
@@ -1667,6 +1923,62 @@
   endif (StdAir_FOUND)
 endmacro (display_stdair)

+# SEvMgr
+macro (display_sevmgr)
+  if (SEvMgr_FOUND)
+    message (STATUS)
+    message (STATUS "* SEvMgr:")
+    message (STATUS "  - SEVMGR_VERSION ............. : ${SEVMGR_VERSION}")
+    message (STATUS "  - SEVMGR_BINARY_DIRS ......... : ${SEVMGR_BINARY_DIRS}")
+    message (STATUS "  - SEVMGR_EXECUTABLES ......... : ${SEVMGR_EXECUTABLES}")
+    message (STATUS "  - SEVMGR_LIBRARY_DIRS ........ : ${SEVMGR_LIBRARY_DIRS}")
+    message (STATUS "  - SEVMGR_LIBRARIES ........... : ${SEVMGR_LIBRARIES}")
+    message (STATUS "  - SEVMGR_INCLUDE_DIRS ........ : ${SEVMGR_INCLUDE_DIRS}")
+  endif (SEvMgr_FOUND)
+endmacro (display_sevmgr)
+
+# TraDemGen
+macro (display_trademgen)
+  if (TraDemGen_FOUND)
+    message (STATUS)
+    message (STATUS "* TraDemGen:")
+    message (STATUS "  - TRADEMGEN_VERSION .......... : ${TRADEMGEN_VERSION}")
+    message (STATUS "  - TRADEMGEN_BINARY_DIRS ...... : ${TRADEMGEN_BINARY_DIRS}")
+    message (STATUS "  - TRADEMGEN_EXECUTABLES ...... : ${TRADEMGEN_EXECUTABLES}")
+    message (STATUS "  - TRADEMGEN_LIBRARY_DIRS ..... : ${TRADEMGEN_LIBRARY_DIRS}")
+    message (STATUS "  - TRADEMGEN_LIBRARIES ........ : ${TRADEMGEN_LIBRARIES}")
+    message (STATUS "  - TRADEMGEN_INCLUDE_DIRS ..... : ${TRADEMGEN_INCLUDE_DIRS}")
+  endif (TraDemGen_FOUND)
+endmacro (display_trademgen)
+
+# TravelCCM
+macro (display_travelccm)
+  if (TravelCCM_FOUND)
+    message (STATUS)
+    message (STATUS "* TravelCCM:")
+    message (STATUS "  - TRAVELCCM_VERSION .......... : ${TRAVELCCM_VERSION}")
+    message (STATUS "  - TRAVELCCM_BINARY_DIRS ...... : ${TRAVELCCM_BINARY_DIRS}")
+    message (STATUS "  - TRAVELCCM_EXECUTABLES ...... : ${TRAVELCCM_EXECUTABLES}")
+    message (STATUS "  - TRAVELCCM_LIBRARY_DIRS ..... : ${TRAVELCCM_LIBRARY_DIRS}")
+    message (STATUS "  - TRAVELCCM_LIBRARIES ........ : ${TRAVELCCM_LIBRARIES}")
+    message (STATUS "  - TRAVELCCM_INCLUDE_DIRS ..... : ${TRAVELCCM_INCLUDE_DIRS}")
+  endif (TravelCCM_FOUND)
+endmacro (display_travelccm)
+
+# AirSched
+macro (display_airsched)
+  if (AirSched_FOUND)
+    message (STATUS)
+    message (STATUS "* AirSched:")
+    message (STATUS "  - AIRSCHED_VERSION ........... : ${AIRSCHED_VERSION}")
+    message (STATUS "  - AIRSCHED_BINARY_DIRS ....... : ${AIRSCHED_BINARY_DIRS}")
+    message (STATUS "  - AIRSCHED_EXECUTABLES ....... : ${AIRSCHED_EXECUTABLES}")
+    message (STATUS "  - AIRSCHED_LIBRARY_DIRS ...... : ${AIRSCHED_LIBRARY_DIRS}")
+    message (STATUS "  - AIRSCHED_LIBRARIES ......... : ${AIRSCHED_LIBRARIES}")
+    message (STATUS "  - AIRSCHED_INCLUDE_DIRS ...... : ${AIRSCHED_INCLUDE_DIRS}")
+  endif (AirSched_FOUND)
+endmacro (display_airsched)
+
 # AirRAC
 macro (display_airrac)
   if (AirRAC_FOUND)
@@ -1695,19 +2007,75 @@
   endif (RMOL_FOUND)
 endmacro (display_rmol)

-# Airinv
+# AirInv
 macro (display_airinv)
-  if (Airinv_FOUND)
+  if (AirInv_FOUND)
     message (STATUS)
-    message (STATUS "* Airinv:")
+    message (STATUS "* AirInv:")
     message (STATUS "  - AIRINV_VERSION ............. : ${AIRINV_VERSION}")
     message (STATUS "  - AIRINV_BINARY_DIRS ......... : ${AIRINV_BINARY_DIRS}")
     message (STATUS "  - AIRINV_EXECUTABLES ......... : ${AIRINV_EXECUTABLES}")
     message (STATUS "  - AIRINV_LIBRARY_DIRS ........ : ${AIRINV_LIBRARY_DIRS}")
     message (STATUS "  - AIRINV_LIBRARIES ........... : ${AIRINV_LIBRARIES}")
     message (STATUS "  - AIRINV_INCLUDE_DIRS ........ : ${AIRINV_INCLUDE_DIRS}")
-  endif (Airinv_FOUND)
+  endif (AirInv_FOUND)
 endmacro (display_airinv)
+
+# AvlCal
+macro (display_avlcal)
+  if (AvlCal_FOUND)
+    message (STATUS)
+    message (STATUS "* AvlCal:")
+    message (STATUS "  - AVLCAL_VERSION ............. : ${AVLCAL_VERSION}")
+    message (STATUS "  - AVLCAL_BINARY_DIRS ......... : ${AVLCAL_BINARY_DIRS}")
+    message (STATUS "  - AVLCAL_EXECUTABLES ......... : ${AVLCAL_EXECUTABLES}")
+    message (STATUS "  - AVLCAL_LIBRARY_DIRS ........ : ${AVLCAL_LIBRARY_DIRS}")
+    message (STATUS "  - AVLCAL_LIBRARIES ........... : ${AVLCAL_LIBRARIES}")
+    message (STATUS "  - AVLCAL_INCLUDE_DIRS ........ : ${AVLCAL_INCLUDE_DIRS}")
+  endif (AvlCal_FOUND)
+endmacro (display_avlcal)
+
+# SimFQT
+macro (display_simfqt)
+  if (SimFQT_FOUND)
+    message (STATUS)
+    message (STATUS "* SimFQT:")
+    message (STATUS "  - SIMFQT_VERSION ............. : ${SIMFQT_VERSION}")
+    message (STATUS "  - SIMFQT_BINARY_DIRS ......... : ${SIMFQT_BINARY_DIRS}")
+    message (STATUS "  - SIMFQT_EXECUTABLES ......... : ${SIMFQT_EXECUTABLES}")
+    message (STATUS "  - SIMFQT_LIBRARY_DIRS ........ : ${SIMFQT_LIBRARY_DIRS}")
+    message (STATUS "  - SIMFQT_LIBRARIES ........... : ${SIMFQT_LIBRARIES}")
+    message (STATUS "  - SIMFQT_INCLUDE_DIRS ........ : ${SIMFQT_INCLUDE_DIRS}")
+  endif (SimFQT_FOUND)
+endmacro (display_simfqt)
+
+# SimLFS
+macro (display_simlfs)
+  if (SimLFS_FOUND)
+    message (STATUS)
+    message (STATUS "* SimLFS:")
+    message (STATUS "  - SIMLFS_VERSION ............. : ${SIMLFS_VERSION}")
+    message (STATUS "  - SIMLFS_BINARY_DIRS ......... : ${SIMLFS_BINARY_DIRS}")
+    message (STATUS "  - SIMLFS_EXECUTABLES ......... : ${SIMLFS_EXECUTABLES}")
+    message (STATUS "  - SIMLFS_LIBRARY_DIRS ........ : ${SIMLFS_LIBRARY_DIRS}")
+    message (STATUS "  - SIMLFS_LIBRARIES ........... : ${SIMLFS_LIBRARIES}")
+    message (STATUS "  - SIMLFS_INCLUDE_DIRS ........ : ${SIMLFS_INCLUDE_DIRS}")
+  endif (SimLFS_FOUND)
+endmacro (display_simlfs)
+
+# SimCRS
+macro (display_simcrs)
+  if (SimCRS_FOUND)
+    message (STATUS)
+    message (STATUS "* SimCRS:")
+    message (STATUS "  - SIMCRS_VERSION ............. : ${SIMCRS_VERSION}")
+    message (STATUS "  - SIMCRS_BINARY_DIRS ......... : ${SIMCRS_BINARY_DIRS}")
+    message (STATUS "  - SIMCRS_EXECUTABLES ......... : ${SIMCRS_EXECUTABLES}")
+    message (STATUS "  - SIMCRS_LIBRARY_DIRS ........ : ${SIMCRS_LIBRARY_DIRS}")
+    message (STATUS "  - SIMCRS_LIBRARIES ........... : ${SIMCRS_LIBRARIES}")
+    message (STATUS "  - SIMCRS_INCLUDE_DIRS ........ : ${SIMCRS_INCLUDE_DIRS}")
+  endif (SimCRS_FOUND)
+endmacro (display_simcrs)

 ##
 macro (display_status_all_modules)
@@ -1793,9 +2161,17 @@
   display_mysql ()
   display_soci ()
   display_stdair ()
+  display_sevmgr ()
+  display_trademgen ()
+  display_travelccm ()
+  display_airsched ()
   display_airrac ()
   display_rmol ()
   display_airinv ()
+  display_avlcal ()
+  display_simfqt ()
+  display_simlfs ()
+  display_simcrs ()
   #
   message (STATUS)
   message (STATUS "Change a value with: cmake -D<Variable>=<Value>" )


Tweak output

Tweak output

--- Common.cmake
+++ Common.cmake
@@ -138,7 +138,7 @@
     set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
   endif (NOT CMAKE_INSTALL_NAME_DIR)
   message(STATUS
-    "Building ${CMAKE_PROJECT_NAME} for ${CMAKE_OSX_ARCHITECTURES}")
+    "Building ${CMAKE_PROJECT_NAME} ${VERSION} for ${CMAKE_OSX_ARCHITECTURES}")
 endif(APPLE)

 # hooks to gather all targets (libaries & executables)


Fix to remove unreferenced components

Fix to remove unreferenced components

--- packaging/WiX/CPackWixConfig.cmake
+++ packaging/WiX/CPackWixConfig.cmake
@@ -23,7 +23,7 @@
  ENDIF()
 ELSE()
   SET(CPACK_COMPONENTS_USED
-    "Server;Client;DataFiles;Development;SharedLibraries;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")
+    "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")
 ENDIF()


Forcing Qt version >= 4.6

Forcing Qt version >= 4.6

--- cmake/dtkDependencies.cmake
+++ cmake/dtkDependencies.cmake
@@ -4,9 +4,9 @@
 ## Copyright (C) 2008 - Julien Wintz, Inria.
 ## Created: Fri Apr  2 09:11:53 2010 (+0200)
 ## Version: $Id$
-## Last-Updated: Mon Apr 26 10:56:47 2010 (+0200)
+## Last-Updated: Wed Jun 23 17:28:35 2010 (+0200)
 ##           By: Julien Wintz
-##     Update #: 30
+##     Update #: 31
 ######################################################################
 ##
 ### Commentary:
@@ -32,7 +32,7 @@
   set(QT_USE_QTMAIN TRUE)
 endif(WIN32)

-find_package(Qt4 4.6.3 REQUIRED)
+find_package(Qt4 4.6 REQUIRED)
 include(${QT_USE_FILE})

 mark_as_advanced(QT_QMAKE_EXECUTABLE)


Update mkl-dnn: v0.19 (#2941)

Update mkl-dnn: v0.19 (#2941)

--- cmake/external_mkldnn.cmake
+++ cmake/external_mkldnn.cmake
@@ -18,10 +18,10 @@

 # Includes blas 3.8.0 in mkldnn
 set(NGRAPH_MKLDNN_SHORT_VERSION 0)
-set(NGRAPH_MKLDNN_FULL_VERSION 0.18.0.0)
-set(NGRAPH_MKLDNN_VERSION "v0.18")
-set(NGRAPH_MKLDNN_SUB_VERSION "2019.0.3.20190220")
-set(NGRAPH_MKLDNN_GIT_TAG "v0.18")
+set(NGRAPH_MKLDNN_FULL_VERSION 0.19.0.0)
+set(NGRAPH_MKLDNN_VERSION "v0.19")
+set(NGRAPH_MKLDNN_SUB_VERSION "2019.0.5.20190502")
+set(NGRAPH_MKLDNN_GIT_TAG "v0.19")

 #------------------------------------------------------------------------------
 # Fetch and install MKL-DNN
@@ -92,13 +92,13 @@
 set(MKLVERSION ${NGRAPH_MKLDNN_SUB_VERSION})
 if (LINUX)
     set(MKLPACKAGE "mklml_lnx_${MKLVERSION}.tgz")
-    set(MKL_SHA1_HASH b536cd3929ab9ff26a9adc903c92d006d142107b)
+    set(MKL_SHA1_HASH 6ab490f0b358124338d04ee9383c3cbc536969d8)
 elseif (APPLE)
     set(MKLPACKAGE "mklml_mac_${MKLVERSION}.tgz")
-    set(MKL_SHA1_HASH cb7ccbf73275d5bee19b4d5691c834bf894d1761)
+    set(MKL_SHA1_HASH a1c42af04f990b0e515a1c31946424b2e68fccc9)
 elseif (WIN32)
     set(MKLPACKAGE "mklml_win_${MKLVERSION}.zip")
-    set(MKL_SHA1_HASH 2f8ae6ef07452c3229bfb7c2aafbae71933d04e3)
+    set(MKL_SHA1_HASH 9d6ff4d5a486689338158093e96c43ee442b65f0)
 endif()
 set(MKL_LIBS ${MKLML_LIB} ${OMP_LIB})
 set(MKLURL ${MKLURLROOT}${MKLPACKAGE})


Fix linking with LLVM_LINK_LLVM_DYLIB=ON

Linking with LLVM shared libraries currently produces linker errors.  This works around the issue
(pr24953) by disabling linking with llvm so for lldb libraries.

Patch by Evangelos Foutras.

Reviewers: zturner

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D16293

git-svn-id: 4c4cc70b1ef44ba2b7963015e681894188cea27e@258921 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -56,7 +56,7 @@
   if (PARAM_OBJECT)
     add_library(${name} ${libkind} ${srcs})
   else()
-    llvm_add_library(${name} ${libkind} ${srcs})
+    llvm_add_library(${name} ${libkind} DISABLE_LLVM_LINK_LLVM_DYLIB ${srcs})

     lldb_link_common_libs(${name} "${libkind}")

@@ -93,7 +93,7 @@
 endmacro(add_lldb_library)

 macro(add_lldb_executable name)
-  add_llvm_executable(${name} ${ARGN})
+  add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
   set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
 endmacro(add_lldb_executable)


* CMake shader_compiler.cmake no longer passes `-mall` to tzslc, because that flag was removed with the recent refactor

--- cmake/shader_compiler.cmake
+++ cmake/shader_compiler.cmake
@@ -12,7 +12,7 @@
 	add_custom_command(
 		OUTPUT ${processed_shader_path}
 		COMMENT "TZSLC_VK: Preprocessing ${SHADER} -> ${processed_shader_name}"
-		COMMAND "${TZSLC_EXECUTABLE_PATH}" ${shader_path} -mall -o ${processed_shader_path}
+		COMMAND "${TZSLC_EXECUTABLE_PATH}" ${shader_path} -o ${processed_shader_path}
 		DEPENDS tzslc ${shader_path}
 		IMPLICIT_DEPENDS CXX ${shader_path}
 		VERBATIM
@@ -40,7 +40,7 @@
 	add_custom_command(
 		OUTPUT ${output_path}
 		COMMENT "TZSLC_OGL: Building ${SHADER} -> ${output_name}"
-		COMMAND "${TZSLC_EXECUTABLE_PATH}" ${shader_path} -mall -o ${output_path}
+		COMMAND "${TZSLC_EXECUTABLE_PATH}" ${shader_path} -o ${output_path}
 		DEPENDS tzslc ${shader_path}
 		IMPLICIT_DEPENDS CXX ${processed_shader_path}
 		VERBATIM


cpack: proper naming for source package

cpack: proper naming for source package

--- cmake/tarantool_cpack.cmake
+++ cmake/tarantool_cpack.cmake
@@ -12,8 +12,8 @@
     "mod/box/tarantool_box"
     "mod/box/tarantool_feeder" "install_manifest.txt"
     "Makefile" "cmake_install.cmake" "test/var/" "\\\\.a")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME
-"tarantool-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-src")
+
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "tarantool-${TARANTOOL_VERSION}-src")
 #
 # Provide options for the binary distribution.
 #


BUG: Fixing CTK path due to bug in ExternalProject that prohibits dir names that begin with 3 upper-case letters

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -178,7 +178,7 @@
   set(proj CTK)
   ExternalProject_Add(CTK
     GIT_REPOSITORY "http://github.com/commontk/CTK.git"
-    SOURCE_DIR CTK
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/CTK
     BINARY_DIR CTK-Build
     CMAKE_GENERATOR ${gen}
     CMAKE_ARGS


Simplify tarball target

Simplify tarball target

--- GitTargets.cmake
+++ GitTargets.cmake
@@ -85,28 +85,25 @@
   )

 # tarball
-set(TARBALL_RELATIVE "${CMAKE_PROJECT_NAME}-${VERSION}.tar")
-set(TARBALL_ABSOLUTE "${CMAKE_BINARY_DIR}/${TARBALL_RELATIVE}")
+set(TARBALL "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar")

 add_custom_target(tarball-create
   COMMAND ${GIT_EXECUTABLE} archive --worktree-attributes
-    --prefix ${CMAKE_PROJECT_NAME}-${VERSION}/ -o ${TARBALL_ABSOLUTE}
+    --prefix ${CMAKE_PROJECT_NAME}-${VERSION}/ -o ${TARBALL}
     release-${VERSION}
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  COMMENT "Creating ${TARBALL_ABSOLUTE}"
+  COMMENT "Creating ${TARBALL}"
   )

 if(GZIP_EXECUTABLE)
   add_custom_target(tarball
-    COMMAND ${CMAKE_COMMAND} -E remove ${TARBALL_RELATIVE}.gz
-    COMMAND ${GZIP_EXECUTABLE} ${TARBALL_RELATIVE}
+    COMMAND ${CMAKE_COMMAND} -E remove ${TARBALL}.gz
+    COMMAND ${GZIP_EXECUTABLE} ${TARBALL}
     DEPENDS tarball-create
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
-    COMMENT
-      "Compressing ${TARBALL_ABSOLUTE}.gz"
+    COMMENT "Compressing ${TARBALL}.gz"
   )
-  set(TARBALL_RELATIVE "${TARBALL_RELATIVE}.gz")
-  set(TARBALL_ABSOLUTE "${TARBALL_ABSOLUTE}.gz")
+  set(TARBALL_GZ "${TARBALL}.gz")
 else()
   add_custom_target(tarball DEPENDS tarball-create)
 endif()


build: don't add C flags to RC files

build: don't add C flags to RC files

This was adding a spurious `-I` to the compile flags which resulted in the
output being placed incorrectly.  Simply elide the flags for RC targets.

--- CoreFoundation/cmake/modules/CoreFoundationAddFramework.cmake
+++ CoreFoundation/cmake/modules/CoreFoundationAddFramework.cmake
@@ -63,7 +63,7 @@
   endif()
   target_compile_options(${NAME}
                          PRIVATE
-                           -I;${CMAKE_BINARY_DIR}/${NAME}.framework/PrivateHeaders)
+                           $<$<OR:$<COMPILE_LANGUAGE:ASM>,$<COMPILE_LANGUAGE:C>>:-I;${CMAKE_BINARY_DIR}/${NAME}.framework/PrivateHeaders>)
   add_dependencies(${NAME} ${NAME}_POPULATE_HEADERS)

   if(AF_FRAMEWORK_DIRECTORY)


Push ParaView forward

Push ParaView forward

--- 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 "f38113aa2a2a7a7549e1aa5033b546586c07bb74")
+  set(_paraview_revision "1fd5d362094ec8a5ca6bbbff5508e9800bf2bb32")
 endif()
 add_revision(paraview
   GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"


Improved greatly how flags are handled among buildtypes...

--- RageCommon.cmake
+++ RageCommon.cmake
@@ -50,18 +50,15 @@
 	# Managing Build Types
 	# default build type
 	IF(NOT CMAKE_BUILD_TYPE)
-	  SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug Release." FORCE)
+	  SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
 	ENDIF(NOT CMAKE_BUILD_TYPE)

-	IF (CMAKE_BUILD_TYPE STREQUAL Debug)
-	#todo : use default cmake debug definition
-		ADD_DEFINITIONS(-DDEBUG )
-		SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "Verbose build commands enabled for Debug build" FORCE)
-	ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug)
+	#Verbose Makefile if not release build
 	IF (CMAKE_BUILD_TYPE STREQUAL Release)
-	#todo : use default cmake release definition
-		ADD_DEFINITIONS(-DNDEBUG -DNRAGELOG)
-		SET(CMAKE_VERBOSE_MAKEFILE OFF CACHE BOOL "Verbose build commands disabled for Release build" FORCE)
+		#on for debugging build commands only. should be off otherwise
+		SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "Verbose build commands disabled for Release build" FORCE)
+	ELSE (CMAKE_BUILD_TYPE STREQUAL Release)
+		SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "Verbose build commands enabled for Non Release build" FORCE)
 	ENDIF (CMAKE_BUILD_TYPE STREQUAL Release)

 	FILE(GLOB HEADERS ${CMAKE_SOURCE_DIR}/include/*.hh)
@@ -137,6 +134,7 @@

 #
 #Compiler Specific rules
+# All modifications for Flags should be here
 #
 IF(MSVC)
 	MESSAGE( STATUS "Visual Studio Compiler detected. Adjusting C++ flags...")
@@ -146,32 +144,62 @@
 ENDIF(MSVC)
 IF(CMAKE_COMPILER_IS_GNUCXX)
 	MESSAGE( STATUS "GCC Compiler detected. Adjusting C++ flags...")
-	SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wabi" CACHE STRING
+
+	SET(GENERATE_PROFILING_INFO OFF CACHE BOOL "On to generate profiling information to use with gprof.")
+	SET(PROFILE_FLAG)
+	IF(GENERATE_PROFILING_INFO)
+		SET(PROFILE_FLAG -pg)
+	ENDIF(GENERATE_PROFILING_INFO)
+
+
+	SET( CMAKE_C_FLAGS "${PROFILE_FLAG} -Wall -pedantic" CACHE STRING
+	    "Flags for C compiler."
+	    FORCE )
+	SET( CMAKE_C_FLAGS_DEBUG "-g -D_DEBUG" CACHE STRING
+	    "Flags used by the C compiler during debug builds."
+	    FORCE )
+	SET( CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG -DNRAGELOG" CACHE STRING
+	    "Flags used by the C compiler during release minsize builds."
+	    FORCE )
+	SET( CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG -DNRAGELOG" CACHE STRING
+	    "Flags used by the C compiler during release builds."
+	    FORCE )
+	SET( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING
+	    "Flags used by the C compiler during release with debug info builds."
+	    FORCE )
+
+    	SET( CMAKE_CXX_FLAGS "${PROFILE_FLAG} -Wall -Wabi" CACHE STRING
+	    "Flags for C++ compiler."
+	    FORCE )
+	SET( CMAKE_CXX_FLAGS_DEBUG "-g -D_DEBUG" CACHE STRING
 	    "Flags used by the C++ compiler during debug builds."
 	    FORCE )
-	SET( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -pedantic" CACHE STRING
-	    "Flags used by the C compiler during debug builds."
-	    FORCE )
-
+	SET( CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DNRAGELOG" CACHE STRING
+	    "Flags used by the C++ compiler during release minsize builds."
+	    FORCE )
+	SET( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -DNRAGELOG" CACHE STRING
+	    "Flags used by the C++ compiler during release builds."
+	    FORCE )
+	SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING
+	    "Flags used by the C++ compiler during release with debug info builds."
+	    FORCE )
+
+	SET(RAGE_COMMON_LINKER_FLAGS)
 	IF (MSYS)
-	    SET( CMAKE_EXE_LINKER_FLAGS_DEBUG
-	     "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -Wl,--warn-once" CACHE STRING
-	     "Flags used for linking binaries during debug builds."
+		SET(RAGE_COMMON_LINKER_FLAGS -Wl,--warn-once)
+	ELSE (MSYS)
+		SET(RAGE_COMMON_LINKER_FLAGS -Wl,--warn-unresolved-symbols,--warn-once)
+	ENDIF (MSYS)
+
+	SET( CMAKE_EXE_LINKER_FLAGS
+	     "${PROFILE_FLAG} ${RAGE_COMMON_LINKER_FLAGS}" CACHE STRING
+	     "Flags used by the linker."
 	     FORCE )
-	    SET( CMAKE_SHARED_LINKER_FLAGS_DEBUG
-	     "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--warn-once" CACHE STRING
-	     "Flags used by the shared libraries linker during debug builds."
+
+     	SET( CMAKE_SHARED_LINKER_FLAGS
+	     "${PROFILE_FLAG} ${RAGE_COMMON_LINKER_FLAGS}" CACHE STRING
+	     "Flags used by the linker."
 	     FORCE )
-	ELSE (MSYS)
-	    SET( CMAKE_EXE_LINKER_FLAGS_DEBUG
-	     "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
-	     "Flags used for linking binaries during debug builds."
-	     FORCE )
-	    SET( CMAKE_SHARED_LINKER_FLAGS_DEBUG
-	     "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--warn-unresolved-symbols,--warn-once" CACHE STRING
-	     "Flags used by the shared libraries linker during debug builds."
-	     FORCE )
-	ENDIF (MSYS)

 ENDIF(CMAKE_COMPILER_IS_GNUCXX)


CMake prefix path passed down to the MITK subproject

You cannot pass arguments with semicolons to an external project after
the CMAKE_ARGS option. Therefore, you need to replace the semicolons with
double carets, define double carets as list separators, and pass this
value to the EP.

CMAKE_CACHE_ARGS does not have this limitation, it keeps the semicolons.
But my experience showed that if you change an argument that is passed with
CMAKE_CACHE_ARGS, the configuration is not updated, and the EP will be
configured with the original options.

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -368,6 +368,8 @@
 endif()

 set(proj MITK-Configure)
+
+string(REPLACE ";" "^^" _prefix_path_with_carets "${CMAKE_PREFIX_PATH}")

 ExternalProject_Add(${proj}
   LIST_SEPARATOR ^^
@@ -444,6 +446,7 @@
   CMAKE_ARGS
     ${mitk_initial_cache_arg}
     ${MAC_OSX_ARCHITECTURE_ARGS}
+    -DCMAKE_PREFIX_PATH:PATH=${_prefix_path_with_carets}

   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   BINARY_DIR ${CMAKE_BINARY_DIR}/MITK-build


COMP: Superbuild changes for log4cpp

COMP: Superbuild changes for log4cpp

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -122,7 +122,7 @@
   INSTALL_COMMAND ""
   DEPENDS
     # Mandatory dependencies
-    #  - none
+    ${log4cpp_DEPENDS}
     # Optionnal dependencies
     ${QtMobility_DEPENDS}
     ${kwstyle_DEPENDS}
@@ -210,6 +210,7 @@
     -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}    # FindPythonQt expects PYTHON_INCLUDE_DIR
     -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}        # FindPythonQt expects PYTHON_LIBRARY
     -DPYTHONQT_INSTALL_DIR:PATH=${PYTHONQT_INSTALL_DIR} # FindPythonQt expects PYTHONQT_INSTALL_DIR
+    -Dlog4cpp_DIR:PATH=${log4cpp_DIR} # Findlog4cpp expects a log4cpp_DIR variable to be defined
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   BINARY_DIR ${CMAKE_BINARY_DIR}/CTK-build
   BUILD_COMMAND ""


Fix the CTK version used in the MITK superbuild.

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -16,7 +16,7 @@
   IF(NOT DEFINED CTK_DIR)
     ExternalProject_Add(${proj}
       GIT_REPOSITORY git://github.com/commontk/CTK.git
-      GIT_TAG origin/master
+      GIT_TAG 1608ad8ac1e0e548e3cb
       BINARY_DIR ${proj}-build
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}


[INTERNAL] FindSDE: Use sde64 when available

--- util/cmake/FindSDE.cmake
+++ util/cmake/FindSDE.cmake
@@ -45,21 +45,28 @@
 #   SDE_EXECUTABLE - the Intel® SDE executable (full path)
 #   SDE_VERSION_STRING - the version of Intel® SDE found

-find_program(SDE_EXECUTABLE
-    NAMES sde
-    PATHS
-        /usr/bin
-        /usr/local/bin
-        /opt/local/bin
-    DOC "Intel Software Development Emulator"
-)
+set(SDE_EXECUTABLE)
+set(SDE_VERSION_STRING)

-if (SDE_EXECUTABLE)
-    execute_process(COMMAND "${SDE_EXECUTABLE}" "--version" OUTPUT_VARIABLE SDE_OUTPUT_VERSION)
-    if (SDE_OUTPUT_VERSION MATCHES "Software Development Emulator")
-        string(REGEX REPLACE ".*Software Development Emulator.*Version:[ ]*([0-9]+\\.[^ ]+).*" "\\1" SDE_VERSION_STRING "${SDE_OUTPUT_VERSION}")
+# first try 64bit and then 32bit version of sde
+foreach(sde_exec "sde64" "sde")
+    find_program(SDE_EXECUTABLE
+        NAMES "${sde_exec}"
+        PATHS
+            /usr/bin
+            /usr/local/bin
+            /opt/local/bin
+        DOC "Intel Software Development Emulator"
+    )
+
+    if (SDE_EXECUTABLE)
+      execute_process(COMMAND "${SDE_EXECUTABLE}" "--version" OUTPUT_VARIABLE SDE_OUTPUT_VERSION)
+      if (SDE_OUTPUT_VERSION MATCHES "Software Development Emulator")
+          string(REGEX REPLACE ".*Software Development Emulator.*Version:[ ]*([0-9]+\\.[^ ]+).*" "\\1" SDE_VERSION_STRING "${SDE_OUTPUT_VERSION}")
+          break()
+      endif()
     endif()
-endif()
+endforeach()

 include(FindPackageHandleStandardArgs)


Small cleanup in dlib cmake.

Small cleanup in dlib cmake.

--- cmake/DLib.cmake
+++ cmake/DLib.cmake
@@ -99,17 +99,15 @@

   message(STATUS "  * Create targets for dlib library")
   add_library(dlib::dlib STATIC IMPORTED)
-
+
+  set_target_properties(dlib::dlib PROPERTIES
+    IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/install/dlib/lib/${CMAKE_STATIC_LIBRARY_PREFIX}dlib${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/install/dlib/include"
+    )
+
   if(MSVC)
     set_target_properties(dlib::dlib PROPERTIES
-      IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/install/dlib/lib/${CMAKE_STATIC_LIBRARY_PREFIX}dlib${CMAKE_STATIC_LIBRARY_SUFFIX}"
       IMPORTED_LOCATION_DEBUG "${CMAKE_BINARY_DIR}/install/dlib/lib/${CMAKE_STATIC_LIBRARY_PREFIX}dlibd${CMAKE_STATIC_LIBRARY_SUFFIX}"
-      INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/install/dlib/include"
-      )
-  else()
-    set_target_properties(dlib::dlib PROPERTIES
-      IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/install/dlib/lib/${CMAKE_STATIC_LIBRARY_PREFIX}dlib${CMAKE_STATIC_LIBRARY_SUFFIX}"
-      INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/install/dlib/include"
       )
   endif()
 endif()


Add ARCH=NONE to CMake documentation.

Add ARCH=NONE to CMake documentation.

--- cmake/arch.cmake
+++ cmake/arch.cmake
@@ -4,7 +4,8 @@
 message("   ARCH=MSP       TI MSP430 16-bit architecture.")
 message("   ARCH=ARM       ARM 32-bit architecture.")
 message("   ARCH=X86       Intel x86-compatible 32-bit architecture.")
-message("   ARCH=X64       AMD x86_64-compatible 64-bit architecture.\n")
+message("   ARCH=X64       AMD x86_64-compatible 64-bit architecture.")
+message("   ARCH=NONE      No specific architecture (disable some features).\n")

 message(STATUS "Available word sizes (default = 64):")
 message("   WORD=8         Build a 8-bit library.")


cmake: Rework java.cmake

cmake: Rework java.cmake

--- cmake/java.cmake
+++ cmake/java.cmake
@@ -82,8 +82,8 @@
   get_filename_component(PROTO_DIR ${PROTO_FILE} DIRECTORY)
   string(REGEX REPLACE "_" "" PROTO_DIR ${PROTO_DIR})
   get_filename_component(PROTO_NAME ${PROTO_FILE} NAME_WE)
-  set(PROTO_OUT ${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT}/src/main/java/com/google/${PROTO_DIR})
-  set(PROTO_JAVA ${PROTO_OUT}/${PROTO_NAME}.java)
+  set(PROTO_OUT java/${JAVA_PROJECT}/src/main/java/com/google/${PROTO_DIR})
+  set(PROTO_JAVA ${PROTO_OUT}/${PROTO_NAME}_timestamp)
   #message(STATUS "protoc java: ${PROTO_JAVA}")
   add_custom_command(
     OUTPUT ${PROTO_JAVA}
@@ -93,12 +93,19 @@
     ${PROTO_DIRS}
     "--java_out=${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT}/src/main/java"
     ${PROTO_FILE}
-    DEPENDS ${PROTO_FILE} ${PROTOC_PRG}
-    COMMENT "Generate Java protocol buffer for ${PROTO_FILE}"
-    VERBATIM)
+    COMMAND ${CMAKE_COMMAND} -E touch ${PROTO_JAVA}
+    DEPENDS
+      ${PROJECT_SOURCE_DIR}/${PROTO_FILE}
+      ${PROTOC_PRG}
+    COMMENT "Generate Java protocol buffer for ${PROJECT_SOURCE_DIR}/${PROTO_FILE}"
+    VERBATIM
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
   list(APPEND PROTO_JAVAS ${PROTO_JAVA})
 endforeach()
-add_custom_target(Java${PROJECT_NAME}_proto DEPENDS ${PROTO_JAVAS} ${PROJECT_NAMESPACE}::ortools)
+add_custom_target(Java${PROJECT_NAME}_proto
+  DEPENDS
+    ${PROTO_JAVAS}
+    ${PROJECT_NAMESPACE}::ortools)

 # Create the native library
 add_library(jniortools SHARED "")
@@ -127,7 +134,10 @@
 #################################
 ##  Java Native Maven Package  ##
 #################################
+message(STATUS "Java runtime project: ${JAVA_NATIVE_PROJECT}")
 set(JAVA_NATIVE_PROJECT_PATH ${PROJECT_BINARY_DIR}/java/${JAVA_NATIVE_PROJECT})
+message(STATUS "Java runtime project build path: ${JAVA_NATIVE_PROJECT_PATH}")
+
 file(MAKE_DIRECTORY ${JAVA_NATIVE_PROJECT_PATH}/${JAVA_RESOURCES_PATH}/${JAVA_NATIVE_PROJECT})

 configure_file(
@@ -135,9 +145,8 @@
   ${JAVA_NATIVE_PROJECT_PATH}/pom.xml
   @ONLY)

-add_custom_target(java_native_package
-  DEPENDS
-  ${JAVA_NATIVE_PROJECT_PATH}/pom.xml
+add_custom_command(
+  OUTPUT ${JAVA_NATIVE_PROJECT_PATH}/timestamp
   COMMAND ${CMAKE_COMMAND} -E copy
     $<TARGET_FILE:jniortools>
     $<$<NOT:$<PLATFORM_ID:Windows>>:$<TARGET_SONAME_FILE:${PROJECT_NAME}>>
@@ -145,9 +154,18 @@
   COMMAND ${MAVEN_EXECUTABLE} compile -B
   COMMAND ${MAVEN_EXECUTABLE} package -B $<$<BOOL:${BUILD_FAT_JAR}>:-Dfatjar=true>
   COMMAND ${MAVEN_EXECUTABLE} install -B $<$<BOOL:${SKIP_GPG}>:-Dgpg.skip=true>
+  COMMAND ${CMAKE_COMMAND} -E touch ${JAVA_NATIVE_PROJECT_PATH}/timestamp
+  DEPENDS
+    ${JAVA_NATIVE_PROJECT_PATH}/pom.xml
   BYPRODUCTS
     ${JAVA_NATIVE_PROJECT_PATH}/target
+  COMMENT "Generate Java native package ${JAVA_NATIVE_PROJECT} (${JAVA_NATIVE_PROJECT_PATH}/timestamp)"
   WORKING_DIRECTORY ${JAVA_NATIVE_PROJECT_PATH})
+
+add_custom_target(java_native_package
+  DEPENDS
+    ${JAVA_NATIVE_PROJECT_PATH}/timestamp
+  WORKING_DIRECTORY java)

 ##########################
 ##  Java Maven Package  ##
@@ -169,8 +187,7 @@

 file(GLOB_RECURSE java_files RELATIVE ${PROJECT_SOURCE_DIR}/ortools/java
   "ortools/java/*.java")
-list(REMOVE_ITEM java_files "CMakeTest.java")
-#message(WARNING "list: ${java_files}")
+message(WARNING "list: ${java_files}")
 set(JAVA_SRCS)
 foreach(JAVA_FILE IN LISTS java_files)
   #message(STATUS "java: ${JAVA_FILE}")
@@ -181,23 +198,32 @@
     COMMAND ${CMAKE_COMMAND} -E copy
       ${PROJECT_SOURCE_DIR}/ortools/java/${JAVA_FILE}
       ${JAVA_OUT}
-      DEPENDS ${PROJECT_SOURCE_DIR}/ortools/java/${JAVA_FILE}
+    DEPENDS ${PROJECT_SOURCE_DIR}/ortools/java/${JAVA_FILE}
     COMMENT "Copy Java file ${JAVA_FILE}"
     VERBATIM)
   list(APPEND JAVA_SRCS ${JAVA_OUT})
 endforeach()

-add_custom_target(java_package ALL
+add_custom_command(
+  OUTPUT ${JAVA_PROJECT_PATH}/timestamp
+  COMMAND ${MAVEN_EXECUTABLE} compile -B
+  COMMAND ${MAVEN_EXECUTABLE} package -B $<$<BOOL:${BUILD_FAT_JAR}>:-Dfatjar=true>
+  COMMAND ${MAVEN_EXECUTABLE} install -B $<$<BOOL:${SKIP_GPG}>:-Dgpg.skip=true>
+  COMMAND ${CMAKE_COMMAND} -E touch ${JAVA_PROJECT_PATH}/timestamp
   DEPENDS
   ${JAVA_PROJECT_PATH}/pom.xml
   ${JAVA_SRCS}
-  COMMAND ${MAVEN_EXECUTABLE} compile -B
-  COMMAND ${MAVEN_EXECUTABLE} package -B $<$<BOOL:${BUILD_FAT_JAR}>:-Dfatjar=true>
-  COMMAND ${MAVEN_EXECUTABLE} install -B $<$<BOOL:${SKIP_GPG}>:-Dgpg.skip=true>
+  Java${PROJECT_NAME}_proto
+  java_native_package
   BYPRODUCTS
     ${JAVA_PROJECT_PATH}/target
+  COMMENT "Generate Java package ${JAVA_PROJECT} (${JAVA_PROJECT_PATH}/timestamp)"
   WORKING_DIRECTORY ${JAVA_PROJECT_PATH})
-add_dependencies(java_package java_native_package Java${PROJECT_NAME}_proto)
+
+add_custom_target(java_package ALL
+  DEPENDS
+    ${JAVA_PROJECT_PATH}/timestamp
+  WORKING_DIRECTORY java)

 #################
 ##  Java Test  ##
@@ -215,6 +241,7 @@
   get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)

   set(TEST_PATH ${PROJECT_BINARY_DIR}/java/${COMPONENT_NAME}/${TEST_NAME})
+  message(STATUS "build path: ${TEST_PATH}")
   file(MAKE_DIRECTORY ${TEST_PATH}/${JAVA_TEST_PATH})

   add_custom_command(
@@ -230,15 +257,24 @@
     ${TEST_PATH}/pom.xml
     @ONLY)

-  add_custom_target(java_${COMPONENT_NAME}_${TEST_NAME} ALL
+  add_custom_command(
+    OUTPUT ${TEST_PATH}/timestamp
+    COMMAND ${MAVEN_EXECUTABLE} compile -B
+    COMMAND ${CMAKE_COMMAND} -E touch ${TEST_PATH}/timestamp
     DEPENDS
       ${TEST_PATH}/pom.xml
       ${TEST_PATH}/${JAVA_TEST_PATH}/${TEST_NAME}.java
-    COMMAND ${MAVEN_EXECUTABLE} compile -B
+      #${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT}/timestamp
+      java_package
     BYPRODUCTS
       ${TEST_PATH}/target
+    COMMENT "Compiling Java ${COMPONENT_NAME}/${TEST_NAME}.java (${TEST_PATH}/timestamp)"
     WORKING_DIRECTORY ${TEST_PATH})
-  add_dependencies(java_${COMPONENT_NAME}_${TEST_NAME} java_package)
+
+  add_custom_target(java_${COMPONENT_NAME}_${TEST_NAME} ALL
+    DEPENDS
+      ${TEST_PATH}/timestamp
+    WORKING_DIRECTORY java)

   if(BUILD_TESTING)
     add_test(
@@ -267,11 +303,13 @@
   string(REPLACE "_" "" COMPONENT_NAME_LOWER ${COMPONENT_NAME})

   set(SAMPLE_PATH ${PROJECT_BINARY_DIR}/java/${COMPONENT_NAME}/${SAMPLE_NAME})
+  message(STATUS "build path: ${SAMPLE_PATH}")
   file(MAKE_DIRECTORY ${SAMPLE_PATH}/${JAVA_PACKAGE_PATH})

   add_custom_command(
     OUTPUT ${SAMPLE_PATH}/${JAVA_PACKAGE_PATH}/${SAMPLE_NAME}.java
     COMMAND ${CMAKE_COMMAND} -E copy ${FILE_NAME} ${SAMPLE_PATH}/${JAVA_PACKAGE_PATH}
+    #COMMAND ${CMAKE_COMMAND} -E touch ${SAMPLE_PATH}/${JAVA_PACKAGE_PATH}/${SAMPLE_NAME}.java
     MAIN_DEPENDENCY ${FILE_NAME}
     VERBATIM
   )
@@ -284,15 +322,25 @@
     ${SAMPLE_PATH}/pom.xml
     @ONLY)

-  add_custom_target(java_${COMPONENT_NAME}_${SAMPLE_NAME} ALL
+  add_custom_command(
+    OUTPUT ${SAMPLE_PATH}/timestamp
+    COMMAND ${CMAKE_COMMAND} -E echo "compiling ${SAMPLE_NAME}.java"
+    #COMMAND ${MAVEN_EXECUTABLE} compile -B
+    COMMAND ${CMAKE_COMMAND} -E touch ${SAMPLE_PATH}/timestamp
     DEPENDS
       ${SAMPLE_PATH}/pom.xml
       ${SAMPLE_PATH}/${JAVA_PACKAGE_PATH}/${SAMPLE_NAME}.java
-    COMMAND ${MAVEN_EXECUTABLE} compile -B
+      #${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT}/timestamp
+      java_package
     BYPRODUCTS
       ${SAMPLE_PATH}/target
+    COMMENT "Compiling Java sample ${COMPONENT_NAME}/${SAMPLE_NAME}.java (${SAMPLE_PATH}/timestamp)"
     WORKING_DIRECTORY ${SAMPLE_PATH})
-  add_dependencies(java_${COMPONENT_NAME}_${SAMPLE_NAME} java_package)
+
+  add_custom_target(java_${COMPONENT_NAME}_${SAMPLE_NAME} ALL
+    DEPENDS
+      ${SAMPLE_PATH}/timestamp
+    WORKING_DIRECTORY java)

   if(BUILD_TESTING)
     add_test(
@@ -319,6 +367,7 @@
   get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)

   set(EXAMPLE_PATH ${PROJECT_BINARY_DIR}/java/${COMPONENT_NAME}/${EXAMPLE_NAME})
+  message(STATUS "build path: ${EXAMPLE_PATH}")
   file(MAKE_DIRECTORY ${EXAMPLE_PATH}/${JAVA_PACKAGE_PATH})

   add_custom_command(
@@ -336,15 +385,24 @@
     ${EXAMPLE_PATH}/pom.xml
     @ONLY)

-  add_custom_target(java_${COMPONENT_NAME}_${EXAMPLE_NAME} ALL
+  add_custom_command(
+    OUTPUT ${EXAMPLE_PATH}/timestamp
+    COMMAND ${MAVEN_EXECUTABLE} compile -B
+    COMMAND ${CMAKE_COMMAND} -E touch ${EXAMPLE_PATH}/timestamp
     DEPENDS
       ${EXAMPLE_PATH}/pom.xml
       ${EXAMPLE_PATH}/${JAVA_PACKAGE_PATH}/${EXAMPLE_NAME}.java
-    COMMAND ${MAVEN_EXECUTABLE} compile -B
+      #${PROJECT_BINARY_DIR}/java/${JAVA_PROJECT}/timestamp
+      java_package
     BYPRODUCTS
       ${EXAMPLE_PATH}/target
+    COMMENT "Compiling Java ${COMPONENT_NAME}/${EXAMPLE_NAME}.java (${EXAMPLE_PATH}/timestamp)"
     WORKING_DIRECTORY ${EXAMPLE_PATH})
-  add_dependencies(java_${COMPONENT_NAME}_${EXAMPLE_NAME} java_package)
+
+  add_custom_target(java_${COMPONENT_NAME}_${EXAMPLE_NAME} ALL
+    DEPENDS
+      ${EXAMPLE_PATH}/timestamp
+    WORKING_DIRECTORY java)

   if(BUILD_TESTING)
     add_test(


Fix duplicate target in CMAKE when building with option BUILD_ONLY set

--- cmake/sdks.cmake
+++ cmake/sdks.cmake
@@ -147,7 +147,6 @@
     set(TEMP_SDK_DEPENDENCY_BUILD_LIST ${SDK_DEPENDENCY_BUILD_LIST})
     foreach (SDK IN LISTS TEMP_SDK_DEPENDENCY_BUILD_LIST)
         list(FIND SDK_BUILD_LIST ${SDK} DEPENDENCY_INDEX)
-
         if(DEPENDENCY_INDEX LESS 0)
             find_package("aws-cpp-sdk-${SDK}" QUIET)
             if (NOT ${SDK}_FOUND)
@@ -173,7 +172,12 @@

     foreach(SDK IN LISTS SDK_BUILD_LIST)
         set(SDK_DIR "aws-cpp-sdk-${SDK}")
-        add_subdirectory("${SDK_DIR}")
+        # when building with BUILD_ONLY, we will try to find dependencies first by calling find_package
+        # well find_package will set up target if library exists, so here to avoid duplicate target we
+        # test the existence of target first
+        if (NOT TARGET ${SDK_DIR})
+            add_subdirectory("${SDK_DIR}")
+        endif()
         LIST(APPEND EXPORTS "${SDK_DIR}")
     endforeach()


i added commentary about the regression test failure in trio after having investigated it.

--- cmake/trio.cmake
+++ cmake/trio.cmake
@@ -96,7 +96,10 @@
 			PREFIX ${TRIO_DEFAULT_PREFIX}
 			URL ${TRIO_DOWNLOAD_URL}
 			URL_MD5 ${TRIO_MD5SUM}
-			# BUG: trio's regression tests appear to fail.
+			# BUG: trio's regression tests appear to fail on Windows. it's
+			# related to a specifier that i don't use (%m), so i'm not going
+			# worry too much about it. when i'm aware that a fix has been
+			# released, i'll reenable tests.
 			#TEST_BEFORE_INSTALL ${TRIO_RUN_TESTS}
 			# WORKAROUND: the following option needs to be last, as CMake
 			# appears to confuse arguments that follow for part of the


Update borsch script

Update borsch script

--- cmake/util.cmake
+++ cmake/util.cmake
@@ -119,9 +119,14 @@

 function(get_cpack_filename ver name)
     get_compiler_version(COMPILER)
-    get_prefix(STATIC_PREFIX BUILD_STATIC_LIBS)
+
+    if(NOT DEFINED BUILD_STATIC_LIBS)
+      set(BUILD_STATIC_LIBS OFF)
+    endif()

-    set(${name} ${PROJECT_NAME}-${ver}-${STATIC_PREFIX}${COMPILER} PARENT_SCOPE)
+    get_prefix(STATIC_PREFIX ${BUILD_STATIC_LIBS})
+
+    set(${name} ${PACKAGE_NAME}-${ver}-${STATIC_PREFIX}${COMPILER} PARENT_SCOPE)
 endfunction()

 function(get_compiler_version ver)


ENH: Only build tests for modules explicitly enabled.

If BUILD_DEFAULT_MODULES is OFF only the tests for the Modules explicitly
enabled are build to reduce build time.

Tests for modules requested by the ITKGroup_ variable are not enabled because
even for the Core Group, the test dependencies greatly increase the size of
the dependency tree.

For similar reasons, by default tests for only modules that are explicitly
enabled are built.  An option ITK_BUILD_ALL_MODULES_FOR_TESTS is added that,
when turned on, will also build all the tests of dependencies.

Change-Id: If02bde13f7e3cc47604a63ae7eec7bcfed071e5a

--- CMake/ITKModuleEnablement.cmake
+++ CMake/ITKModuleEnablement.cmake
@@ -76,6 +76,12 @@
 # options or ITKGroup_* options.
 option(ITK_BUILD_DEFAULT_MODULES "Build the default ITK modules." ON)

+#----------------------------------------------------------------------
+# Provide an option to build the tests of dependencies of a module when
+# BUILD_TESTING is ON.
+option(ITK_BUILD_ALL_MODULES_FOR_TESTS "Build the tests of module dependencies." OFF)
+mark_as_advanced(ITK_BUILD_ALL_MODULES_FOR_TESTS)
+
 # To maintain backward compatibility
 if(DEFINED ITK_BUILD_ALL_MODULES)
   message(WARNING "ITK_BUILD_ALL_MODULES is deprecated, please remove this entry from the CMake "
@@ -112,7 +118,7 @@
     foreach(dep IN LISTS ITK_MODULE_${itk-module}_DEPENDS)
       itk_module_enable(${dep} ${itk-module})
     endforeach()
-    if(${itk-module}_TESTED_BY)
+    if(${itk-module}_TESTED_BY AND (ITK_BUILD_DEFAULT_MODULES OR ITK_BUILD_ALL_MODULES_FOR_TESTS OR Module_${itk-module}))
       itk_module_enable(${${itk-module}_TESTED_BY} "")
     endif()
   endif()


SDK: also ship bullet headers

SDK: also ship bullet headers

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -110,11 +110,16 @@
   if(WIN32)
     if(OGRE_BUILD_SAMPLES OR OGRE_BUILD_TESTS)
       if(EXISTS "${SDL2_BINARY}")
-	  file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/debug)
-	  file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/release)
-	  file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/relwithdebinfo)
-	  file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/minsizerel)
+        file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/debug)
+        file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/release)
+        file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/relwithdebinfo)
+        file(COPY ${SDL2_BINARY} DESTINATION ${PROJECT_BINARY_DIR}/bin/minsizerel)
       endif()
+    endif()
+
+    if(OGRE_BUILD_DEPENDENCIES AND OGRE_BUILD_COMPONENT_BULLET)
+      install(DIRECTORY ${OGRE_DEP_DIR}/include/bullet DESTINATION include)
+      install(DIRECTORY ${OGRE_DEP_DIR}/lib/cmake/bullet DESTINATION lib/cmake)
     endif()

     if (OGRE_BUILD_PLUGIN_CG)


Tiny bits of cleanup in OIS lib installation for Apple platforms.

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -115,18 +115,10 @@
 		install(FILES ${OIS_LIBRARY_REL} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
 	  endif ()
 	elseif(APPLE)
-	  if (EXISTS ${OGRE_DEP_DIR}/lib/debug/libOIS.a)
-	        install(FILES
-	          ${OGRE_DEP_DIR}/lib/debug/libOIS.a
-	          DESTINATION lib/debug CONFIGURATIONS Debug
-	        )
-	  endif ()
-	  if (EXISTS ${OGRE_DEP_DIR}/lib/release/libOIS.a)
-	        install(FILES
-	          ${OGRE_DEP_DIR}/lib/release/libOIS.a
-	          DESTINATION lib/release CONFIGURATIONS Release RelWithDebInfo MinSizeRel None ""
-	        )
-	  endif ()
+        install(FILES
+          ${OGRE_DEP_DIR}/lib/$(PLATFORM_NAME)/$(CONFIGURATION)/libOIS.a
+          DESTINATION lib/$(PLATFORM_NAME)/$(CONFIGURATION)
+        )
 	endif ()
 	  endif ()

@@ -291,7 +283,7 @@
       copy_release(libGLESv2.dll)
     endif ()

-  elseif(APPLE)
+  elseif(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
     # copy the required libs and frameworks to the build directory (configure_file is the only copy-like op I found in CMake)
     copy_debug(libOIS.a)
     copy_release(libOIS.a)


change implib directory for clblas

change implib directory for clblas

--- CMakeModules/build_clBLAS.cmake
+++ CMakeModules/build_clBLAS.cmake
@@ -28,7 +28,7 @@
 #ExternalProject_Get_Property(clBLAS-external install_dir)
 ADD_LIBRARY(clBLAS SHARED IMPORTED)
 SET_PROPERTY(TARGET clBLAS PROPERTY IMPORTED_LOCATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}clBLAS${CMAKE_SHARED_LIBRARY_SUFFIX}")
-SET_PROPERTY(TARGET clBLAS PROPERTY IMPORTED_IMPLIB "${CMAKE_INSTALL_PREFIX}/lib/clBLAS.lib")
+SET_PROPERTY(TARGET clBLAS PROPERTY IMPORTED_IMPLIB "${CMAKE_INSTALL_PREFIX}/lib/import/clBLAS.lib")
 #SET_TARGET_PROPERTIES(clBLAS PROPERTIES IMPORTED_LOCATION ${clBLAS_location})
 ADD_DEPENDENCIES(clBLAS clBLAS-external)
 SET(CLBLAS_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)


Made the label tests pass again!

Made the label tests pass again!

They were moved from vtkRenderingOpenGL, and they obviously relied
on the vtkRenderingFreeTypeOpenGL overrides to produce the expected
baseline image.

Change-Id: Ic6b33f314a308204a2125d5bc84f3ca056b76b9b

--- Rendering/Label/module.cmake
+++ Rendering/Label/module.cmake
@@ -9,6 +9,7 @@
     vtkIOXML
     vtkTestingCore
     vtkTestingRendering
+    vtkRenderingFreeTypeOpenGL
     vtkRendering${VTK_RENDERING_BACKEND}
     vtkInteractionStyle
   )


Macro ctkMacroGetTargetLibraries can now be used out of a target directory

This could be achieved specifying the target directory using a second
parameter.

--- CMake/ctkMacroTargetLibraries.cmake
+++ CMake/ctkMacroTargetLibraries.cmake
@@ -19,12 +19,22 @@
 ###########################################################################

 #
-#
+# This macro could be invoked using two different signatures:
+#   ctkMacroGetTargetLibraries(TARGET_LIBS)
+# or
+#   ctkMacroGetTargetLibraries(TARGET_LIBS "/path/to/ctk_target_dir")
+#
+# Without specifying the second argument, the current folder will be used.
 #
 MACRO(ctkMacroGetTargetLibraries varname)

-  SET(filepath ${CMAKE_CURRENT_SOURCE_DIR}/target_libraries.cmake)
-  SET(manifestpath ${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake)
+  SET(TARGET_DIRECTORY ${ARGV1})
+  IF("${TARGET_DIRECTORY}" STREQUAL "")
+    SET(TARGET_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  ENDIF()
+
+  SET(filepath ${TARGET_DIRECTORY}/target_libraries.cmake)
+  SET(manifestpath ${TARGET_DIRECTORY}/manifest_headers.cmake)

   # Check if "target_libraries.cmake" or "manifest_headers.cmake" file exists
   IF(NOT EXISTS ${filepath} AND NOT EXISTS ${manifestpath})


Removed unused patch file for ITK 4.7.0.

--- CMakeExternals/PatchITK-4.7.0.cmake
+++ CMakeExternals/PatchITK-4.7.0.cmake
@@ -1,9 +0,0 @@
-# Called by ITK.cmake (ExternalProject_Add) as a patch for ITK to work with external GDCM 2.2.1
-
-set(path "Modules/ThirdParty/GDCM/src/CMakeLists.txt")
-file(STRINGS ${path} contents NEWLINE_CONSUME)
-# more robust search for replacement
-string(REPLACE "gdcmMSFF" "gdcmMSFF gdcmDSED gdcmCommon" contents ${contents})
-set(CONTENTS ${contents})
-configure_file(${TEMPLATE_FILE} ${path} @ONLY)
-


COMP: Add missing include_directories clause for FFTW

Change-Id: I8b7d5c2a9721e7123450cf00595d561b4374b4ba

--- CMake/itkExternal_FFTW.cmake
+++ CMake/itkExternal_FFTW.cmake
@@ -85,6 +85,7 @@
         )
     endif(USE_FFTWD)
     link_directories(${ITK_BINARY_DIR}/fftw/lib)
+    include_directories(${ITK_BINARY_DIR}/fftw/include)
     # backwards compatibility
     set(FFTW_INCLUDE_PATH ${ITK_BINARY_DIR}/fftw/include)
     #


use Thumb2

use Thumb2

--- standard/toolchain-android32.cmake
+++ standard/toolchain-android32.cmake
@@ -1,3 +1,2 @@
 set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)
-set(CMAKE_ANDROID_ARM_MODE ON)
 include(${CMAKE_CURRENT_LIST_DIR}/toolchain-android.cmake)


[build] Compile the EFI bootloader with -Wundef

--- boot/efi/GenericBuild.cmake
+++ boot/efi/GenericBuild.cmake
@@ -27,7 +27,11 @@
    -Wall
    -Wextra
    -Werror
+   -Wundef
    -Wno-unused-parameter
+
+   -DEFI_DEBUG=0                # Because of -Wundef
+   -DEFI_DEBUG_CLEAR_MEMORY=0   # Because of -Wundef
 )

 set(


I'm a moron

I'm a moron

--- CMake/Utilities.cmake
+++ CMake/Utilities.cmake
@@ -78,8 +78,8 @@
         add_definitions(-D_SCL_SECURE_NO_WARNINGS)
         add_compile_options(/W4)
     elseif(UNIX)
-        add_compile_options(-Wall -Wextra -pedantic -Wuninitialized -Wfloat-equal -Woverloaded-virtual
-                            -Wno-deprecated-declarations -Wno-unused-parameter -Wdeprecated-declarations)
+        add_compile_options(-Wall -Wextra -pedantic -Wuninitialized -Wfloat-equal
+                            -Woverloaded-virtual -Wno-unused-parameter)
         if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             add_compile_options(-Wno-nested-anon-types -Wno-gnu-anonymous-struct)
         endif()