Add missing file

Add missing file

--- files.cmake
+++ files.cmake
@@ -36,6 +36,7 @@
     "${PROJECT_SOURCE_DIR}/render_pipeline/rppanda/showbase/direct_object.hpp"
     "${PROJECT_SOURCE_DIR}/render_pipeline/rppanda/showbase/loader.hpp"
     "${PROJECT_SOURCE_DIR}/render_pipeline/rppanda/showbase/sfx_player.hpp"
+    "${PROJECT_SOURCE_DIR}/render_pipeline/rppanda/showbase/messenger.hpp"
     "${PROJECT_SOURCE_DIR}/render_pipeline/rppanda/showbase/showbase.hpp"
 )

@@ -210,6 +211,7 @@
     "${PROJECT_SOURCE_DIR}/src/rppanda/showbase/direct_object.cpp"
     "${PROJECT_SOURCE_DIR}/src/rppanda/showbase/loader.cpp"
     "${PROJECT_SOURCE_DIR}/src/rppanda/showbase/sfx_player.cpp"
+    "${PROJECT_SOURCE_DIR}/src/rppanda/showbase/messenger.cpp"
     "${PROJECT_SOURCE_DIR}/src/rppanda/showbase/showbase.cpp"
 )


Add cmake options for executables

Add cmake options for executables

--- cmake/Utils.cmake
+++ cmake/Utils.cmake
@@ -26,7 +26,7 @@
 endfunction(nucleus_add_library)

 function(nucleus_add_executable name)
-    add_executable(${name} ${ARGN})
+    add_executable(${name} WIN32 MACOSX_BUNDLE ${ARGN})

     if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
         # Enable warnings and multi-process compilation.


erthink-cmake: fix fetch_version macro.

erthink-cmake: fix fetch_version macro.

--- cmake/utils.cmake
+++ cmake/utils.cmake
@@ -145,8 +145,9 @@
     set(${name}_GIT_REVISION 0)

     # Try to get version from VERSION file
-    if(EXISTS "${version_file}/VERSION")
-      file(STRINGS "${version_file}/VERSION" ${name}_VERSION)
+    set(version_file "${source_root_directory}/VERSION")
+    if(EXISTS "${version_file}")
+      file(STRINGS "${version_file}" ${name}_VERSION LIMIT_COUNT 1 LIMIT_INPUT 42)
     endif()

     if(NOT ${name}_VERSION)


PKG: ITK dll done twice

PKG: ITK dll done twice

--- Packaging/install_importlibs.cmake
+++ Packaging/install_importlibs.cmake
@@ -34,7 +34,6 @@
   #required .lib files in install directory.
   file(GLOB import_lib_files
     "${SUPERBUILD_INSTALL_DIR}/lib/*.lib"
-    "${SUPERBUILD_INSTALL_DIR}/bin/itk*.dll"
     )
   foreach( import_lib_file ${import_lib_files})
     install_rule(${import_lib_file})


[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>" )


flags (#13540)

flags (#13540)

* flags

* "fix ci"

--- cmake/flags.cmake
+++ cmake/flags.cmake
@@ -27,7 +27,6 @@

 CheckCompilerCXX11Flag()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 # safe_set_flag
 #
 # Set a compile flag only if compiler is support
@@ -71,6 +70,20 @@
     endif()
 endmacro()

+macro(safe_set_static_flag) # set c_flags and cxx_flags to static or shared
+    if (BUILD_SHARED_LIBS)
+        return() # if build shared libs, the flags keep same with '/MD'
+    endif(BUILD_SHARED_LIBS)
+    foreach(flag_var
+        CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
+        CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
+      if(${flag_var} MATCHES "/MD")
+        string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+      endif(${flag_var} MATCHES "/MD")
+    endforeach(flag_var)
+endmacro()

 CHECK_CXX_SYMBOL_EXISTS(UINT64_MAX "stdint.h" UINT64_MAX_EXISTS)
 if(NOT UINT64_MAX_EXISTS)
@@ -97,9 +110,13 @@

 # Common flags. the compiler flag used for C/C++ sources whenever release or debug
 # Do not care if this flag is support for gcc.
+
+# https://github.com/PaddlePaddle/Paddle/issues/12773
+if (NOT WIN32)
 set(COMMON_FLAGS
     -fPIC
     -fno-omit-frame-pointer
+    -Werror
     -Wall
     -Wextra
     -Wnon-virtual-dtor
@@ -113,11 +130,6 @@
     -Wno-error=ignored-attributes  # Warnings in Eigen, gcc 6.3
     -Wno-error=terminate  # Warning in PADDLE_ENFORCE
 )
-
-# https://github.com/PaddlePaddle/Paddle/issues/12773
-if (NOT WIN32)
-list(APPEND COMMON_FLAGS -Werror)
-endif()

 set(GPU_COMMON_FLAGS
     -fPIC
@@ -133,30 +145,53 @@
     -Wno-error=array-bounds # Warnings in Eigen::array
 )

+else(NOT WIN32)
+set(COMMON_FLAGS
+    "/w") #disable all warnings.
+set(GPU_COMMON_FLAGS
+    "/w") #disable all warnings
+endif(NOT WIN32)
+
 if (APPLE)
     if(NOT CMAKE_CROSSCOMPILING)
         # On Mac OS X build fat binaries with x86_64 architectures by default.
         set (CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX" FORCE)
     endif()
-else()
+endif(APPLE)
+
+if(LINUX)
     set(GPU_COMMON_FLAGS
         -Wall
         -Wextra
         -Werror
         ${GPU_COMMON_FLAGS})
-endif()
+endif(LINUX)

 if(UNIX AND NOT APPLE)
   # except apple from nix*Os family
   set(LINUX TRUE)
 endif(UNIX AND NOT APPLE)

-
 foreach(flag ${COMMON_FLAGS})
     safe_set_cflag(CMAKE_C_FLAGS ${flag})
     safe_set_cxxflag(CMAKE_CXX_FLAGS ${flag})
+
 endforeach()

 foreach(flag ${GPU_COMMON_FLAGS})
     safe_set_nvflag(${flag})
 endforeach()
+
+if(WIN32)
+# windows build turn off warnings.
+safe_set_static_flag()
+    foreach(flag_var
+        CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+        CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO
+        CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
+      if(${flag_var} MATCHES "/W3")
+        string(REGEX REPLACE "/W3" "/w" ${flag_var} "${${flag_var}}")
+      endif(${flag_var} MATCHES "/W3")
+    endforeach(flag_var)
+endif(WIN32)


added cxx compiler cmake arg to gtest_framework project

--- cmake/gtest.cmake
+++ cmake/gtest.cmake
@@ -15,7 +15,7 @@
         URL https://googletest.googlecode.com/files/gtest-1.6.0.zip
         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gtest
         INSTALL_COMMAND "" # do not install this library
-        CMAKE_ARGS -Dgtest_disable_pthreads=ON
+        CMAKE_ARGS -Dgtest_disable_pthreads=ON -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     )

     ExternalProject_Get_Property(${GTEST_FRAMEWORK} source_dir binary_dir)


run_fpga script was broken: filesystem images were not added to serial_boot

[ci skip]

--- cmake/nyuzi.cmake
+++ cmake/nyuzi.cmake
@@ -111,7 +111,7 @@

     # Create FPGA run script
     if(FS_IMAGE_FILES)
-        set(${SERIAL_BOOT_FS} "${CMAKE_CURRENT_BINARY_DIR}/fsimage.bin")
+        set(SERIAL_BOOT_FS "${CMAKE_CURRENT_BINARY_DIR}/fsimage.bin")
     endif()

     file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/run_fpga


Add TIRPC_EPOLL to config.h

Add TIRPC_EPOLL to config.h

Signed-off-by: Daniel Gryniewicz <7c160e8c60410b4d08316c6a35517f4728ce4edb@cohortfs.com>

--- config-h.in.cmake
+++ config-h.in.cmake
@@ -25,6 +25,7 @@
 #cmakedefine HAVE_STRINGS_H 1
 #cmakedefine LITTLEEND 1
 #cmakedefine BIGEND 1
+#cmakedefine TIRPC_EPOLL 1

 /* Package stuff */
 #define PACKAGE "libntirpc"


ENH: build boost libs

ENH: build boost libs

--- CMake/External_boost.cmake
+++ CMake/External_boost.cmake
@@ -15,7 +15,8 @@
   set(BOOST_SB_SRC ${CMAKE_BINARY_DIR}/${proj}/src/${proj})

   if(UNIX)
-    ExternalProject_Add(${proj}
+    if(FALSE)
+      ExternalProject_Add(${proj}
         PREFIX ${proj}
         URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz/download"
         URL_MD5 efbfbff5a85a9330951f243d0a46e4b9
@@ -28,7 +29,28 @@
         PATCH_COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt
         ${BOOST_SB_SRC}
-    )
+      )
+    else()
+      ExternalProject_Add(${proj}
+        PREFIX ${proj}
+        URL "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.gz/download"
+        URL_MD5 efbfbff5a85a9330951f243d0a46e4b9
+        BINARY_DIR ${BOOST_SB_BUILD_DIR}
+        INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+        CONFIGURE_COMMAND
+          ${BOOST_SB_BUILD_DIR}/bootstrap.sh
+            --prefix=${CMAKE_INSTALL_PREFIX}
+        BUILD_COMMAND ./b2
+        INSTALL_COMMAND ./b2 install
+      )
+
+      ExternalProject_Add_Step(${proj} copy_source
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+          ${BOOST_SB_SRC} ${BOOST_SB_BUILD_DIR}
+        DEPENDEES patch update
+        DEPENDERS configure
+      )
+    endif()

     message(STATUS "  Using Boost SuperBuild version")


CMake: print file extensions that codecs are supporting

--- CMake/FeatureSummary.cmake
+++ CMake/FeatureSummary.cmake
@@ -130,22 +130,22 @@
 	set(_core "${_core}  + Mesh Lod\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_DDS)
-	set(_core "${_core}  + DDS image codec\n")
+	set(_core "${_core}  + DDS image codec (.dds)\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_PVRTC)
-	set(_core "${_core}  + PVRTC image codec\n")
+	set(_core "${_core}  + PVRTC image codec (.pvr)\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_ETC)
-	set(_core "${_core}  + ETC image codec\n")
+	set(_core "${_core}  + ETC image codec (.pkm, .ktx) \n")
 endif ()
 if (OGRE_CONFIG_ENABLE_FREEIMAGE)
-	set(_core "${_core}  + FreeImage codec\n")
+	set(_core "${_core}  + FreeImage codec (generic)\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_STBI)
-	set(_core "${_core}  + STBI codec\n")
+	set(_core "${_core}  + STBI codec (generic)\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_ASTC)
-	set(_core "${_core}  + ASTC image codec\n")
+	set(_core "${_core}  + ASTC image codec (.astc)\n")
 endif ()
 if (OGRE_CONFIG_ENABLE_ZIP)
 	set(_core "${_core}  + ZIP archives\n")


Minor fix.

Minor fix.

--- src/cmake/TargetArch.cmake
+++ src/cmake/TargetArch.cmake
@@ -32,7 +32,7 @@

 set(archdetect_c_code "
 #if defined(__aarch64__) || defined(_M_ARM64)
-	#error cmake_ARCH arm_64
+	#error cmake_ARCH arm64
 #elif defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM)
 	#error cmake_ARCH arm
 #elif defined(__i386) || defined(__i386__) || defined(_M_IX86)


Improve path check

Improve path check

--- flags/ios_nocodesign.cmake
+++ flags/ios_nocodesign.cmake
@@ -12,12 +12,20 @@
     _polly_xcode_xcconfig_file_path
     "${CMAKE_CURRENT_LIST_DIR}/../scripts/NoCodeSign.xcconfig"
 )
+
 get_filename_component(
     _polly_xcode_xcconfig_file_path
     "${_polly_xcode_xcconfig_file_path}"
     ABSOLUTE
 )
-if(NOT EXISTS "$ENV{XCODE_XCCONFIG_FILE}")
+
+get_filename_component(
+    _polly_xcode_xcconfig_file_path_env
+    "$ENV{XCODE_XCCONFIG_FILE}"
+  ABSOLUTE
+)
+
+if(NOT EXISTS "${_polly_xcode_xcconfig_file_path_env}")
   polly_fatal_error(
       "Path specified by XCODE_XCCONFIG_FILE environment variable not found"
       "($ENV{XCODE_XCCONFIG_FILE})"
@@ -28,14 +36,14 @@
   string(
       COMPARE
       NOTEQUAL
-      "$ENV{XCODE_XCCONFIG_FILE}"
+      "${_polly_xcode_xcconfig_file_path_env}"
       "${_polly_xcode_xcconfig_file_path}"
       _polly_wrong_xcconfig_path
   )
   if(_polly_wrong_xcconfig_path)
     polly_fatal_error(
         "Unexpected XCODE_XCCONFIG_FILE value: "
-        "    $ENV{XCODE_XCCONFIG_FILE}"
+        "    ${_polly_xcode_xcconfig_file_path_env}"
         "expected: "
         "    ${_polly_xcode_xcconfig_file_path}"
     )


MSVC: fixed ABI/bitness detection with CMake 3.14.1.

--- toolchains/msvc.toolchain.cmake
+++ toolchains/msvc.toolchain.cmake
@@ -49,7 +49,7 @@
 )

 if( NOT DEFINED TNUN_ABI )
-  if ( ${CMAKE_GENERATOR} MATCHES 64 )
+  if ( CMAKE_VS_PLATFORM_NAME MATCHES 64 )
     set( TNUN_ABI x64 )
   else()
     set( TNUN_ABI Win32 )


Bugfix for OGRE-210 and message for atomic

--- CMake/Dependencies.cmake
+++ CMake/Dependencies.cmake
@@ -170,7 +170,7 @@
     find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
 endif()

-if(Boost_FOUND)
+if(Boost_FOUND AND NOT WIN32)
   list(REMOVE_DUPLICATES Boost_LIBRARIES)
 endif()

@@ -181,6 +181,9 @@
 if(Boost_VERSION GREATER 104900)
     macro_log_feature(Boost_SYSTEM_FOUND "boost-system" "Used for threading support" "http://boost.org" FALSE "" "")
     macro_log_feature(Boost_CHRONO_FOUND "boost-chrono" "Used for threading support" "http://boost.org" FALSE "" "")
+	if(Boost_VERSION GREATER 105300)
+		macro_log_feature(Boost_ATOMIC_FOUND "boost-atomic" "Used for threading support" "http://boost.org" FALSE "" "")
+	endif()
 endif()

 # POCO


Updated CTK to fix cmd line module string handling.

--- CMakeExternals/CTK.cmake
+++ CMakeExternals/CTK.cmake
@@ -15,7 +15,7 @@

   if(NOT DEFINED CTK_DIR)

-    set(revision_tag 4e6ac62e)
+    set(revision_tag fef76cef)
     #IF(${proj}_REVISION_TAG)
     #  SET(revision_tag ${${proj}_REVISION_TAG})
     #ENDIF()
@@ -51,7 +51,7 @@
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/CTK_${revision_tag}.tar.gz
-      URL_MD5 dc553f3da6591d490b4175fb66892276
+      URL_MD5 4d001d855cc3f722827a6cd95bfb7d9c
       UPDATE_COMMAND ""
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}


Update device side

Update device side

--- cmake/Depthai/DepthaiDeviceSideConfig.cmake
+++ cmake/Depthai/DepthaiDeviceSideConfig.cmake
@@ -2,7 +2,7 @@
 set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "bde814c917d27dd0e3b11fffe7c21bb44b1650cf")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "1a59c80266cd7a30ba874aa8d4a8277e0bf161ec")

 # "version if applicable"
 set(DEPTHAI_DEVICE_SIDE_VERSION "")


Add workaround for stereo subpixel/extended mode crash at the expense of system performance

--- cmake/Depthai/DepthaiDeviceSideConfig.cmake
+++ cmake/Depthai/DepthaiDeviceSideConfig.cmake
@@ -2,7 +2,7 @@
 set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "a858d35dbe1574fc02e590ae04524ade7b5bf0ba")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "a2baa42ba41f7b79dcbee987b34f24da075de196")

 # "version if applicable"
 set(DEPTHAI_DEVICE_SIDE_VERSION "")


Update FW: bugfix for https://github.com/luxonis/depthai-core/issues/521

--- cmake/Depthai/DepthaiDeviceSideConfig.cmake
+++ cmake/Depthai/DepthaiDeviceSideConfig.cmake
@@ -2,7 +2,7 @@
 set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")

 # "full commit hash of device side binary"
-set(DEPTHAI_DEVICE_SIDE_COMMIT "4829d3c015e229da5cad125ccc80758095160910")
+set(DEPTHAI_DEVICE_SIDE_COMMIT "a65fe39adf0174e0a9671f7118cd3707bcaa64c3")

 # "version if applicable"
 set(DEPTHAI_DEVICE_SIDE_VERSION "")


px4fmu-v2_default: disable sf1xx distance sensor

Due to limited flash space

--- cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -35,7 +35,7 @@
 	drivers/distance_sensor/ll40ls
 	#drivers/distance_sensor/mb12xx
 	drivers/distance_sensor/sf0x
-	drivers/distance_sensor/sf1xx
+	#drivers/distance_sensor/sf1xx
 	#drivers/distance_sensor/srf02
 	#drivers/distance_sensor/teraranger
 	#drivers/distance_sensor/tfmini


Revert "Do not enable builtin_lz4 if fail-on-missing=ON"

This reverts commit df5d33a7e0f01f88d435c6c355c73ae420de233a.

--- cmake/modules/SearchInstalledSoftware.cmake
+++ cmake/modules/SearchInstalledSoftware.cmake
@@ -238,14 +238,10 @@
 #---Check for LZ4--------------------------------------------------------------------
 if(NOT builtin_lz4)
   message(STATUS "Looking for LZ4")
-  if(fail-on-missing)
-    find_package(LZ4 REQUIRED)
-  else()
-    find_package(LZ4)
-    if(NOT LZ4_FOUND)
-      message(STATUS "LZ4 not found. Switching on builtin_lz4 option")
-      set(builtin_lz4 ON CACHE BOOL "" FORCE)
-    endif()
+  find_package(LZ4)
+  if(NOT LZ4_FOUND)
+    message(STATUS "LZ4 not found. Switching on builtin_lz4 option")
+    set(builtin_lz4 ON CACHE BOOL "" FORCE)
   endif()
 endif()


tools: Generate images for ESP32-C2 with required minimal revision

--- components/esptool_py/project_include.cmake
+++ components/esptool_py/project_include.cmake
@@ -55,6 +55,9 @@
 endif()
 if(CONFIG_ESP32C3_REV_MIN)
     set(min_rev ${CONFIG_ESP32C3_REV_MIN})
+endif()
+if(CONFIG_IDF_TARGET_ESP32C2)
+    set(min_rev 1)
 endif()

 if(min_rev)


Fixed non windows path

Fixed non windows path

--- CMakeModules/FindFFmpeg.cmake
+++ CMakeModules/FindFFmpeg.cmake
@@ -113,7 +113,7 @@

 ELSE()

-    # SET(STDINT_OK TRUE)
+    SET(STDINT_OK TRUE)

 ENDIF()


fix indent

fix indent

--- hw/bsp/rp2040/family.cmake
+++ hw/bsp/rp2040/family.cmake
@@ -16,7 +16,7 @@
 	${TOP}/src/host/hub.c
 	${TOP}/src/host/usbh.c
 	${TOP}/src/host/usbh_control.c
-  ${TOP}/src/class/cdc/cdc_host.c
+	${TOP}/src/class/cdc/cdc_host.c
 	${TOP}/src/class/hid/hid_host.c
 	${TOP}/src/class/msc/msc_host.c
 	${TOP}/src/portable/raspberrypi/${FAMILY}/rp2040_usb.c


remove debug output

remove debug output

--- cmake/FindMIC.cmake
+++ cmake/FindMIC.cmake
@@ -175,7 +175,6 @@
       string(TOUPPER "${CMAKE_BUILD_TYPE}" _tmp)
       string(STRIP "${CMAKE_MIC_${_lang}_FLAGS} ${CMAKE_${_lang}_FLAGS_${_tmp}} ${_mic_cflags}" _flags)
       string(REPLACE " " ";" _flags "${_flags}")
-      message(STATUS "_mic_add_object _flags: ${_flags}")
       get_directory_property(_inc INCLUDE_DIRECTORIES)
       foreach(_i ${_inc})
          list(APPEND _flags "-I${_i}")


cmake: add nix windows build path

cmake: add nix windows build path

--- cmake/FindNIX.cmake
+++ cmake/FindNIX.cmake
@@ -12,6 +12,7 @@
   PATH_SUFFIXES nix)

 find_library(NIX_LIBRARY NAMES nix libnix
+  HINTS $ENV{NIX_ROOT}/build/Release
   HINTS $ENV{NIX_BUILD_DIR}
   HINTS ${NIX_INCLUDE_DIR}/../lib
   HINTS ${NIX_INCLUDE_DIR}/../build


adding comments for this fix

adding comments for this fix

--- cmake/generic.cmake
+++ cmake/generic.cmake
@@ -587,6 +587,9 @@
   get_filename_component(PROTO_WE ${grpc_library_PROTO} NAME_WE)
   get_filename_component(PROTO_PATH ${ABS_PROTO} PATH)

+  #FIXME(putcn): the follwoing line is supposed to generate *.pb.h and cc, but
+  # somehow it didn't. line 602 to 604 is to patching this. Leaving this here
+  # for now to enable dist CI.
   protobuf_generate_cpp(grpc_proto_srcs grpc_proto_hdrs "${ABS_PROTO}")
   set(grpc_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.cc")
   set(grpc_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/${PROTO_WE}.grpc.pb.h")


Workaround a CMake bug with Ninja generator.

--- cmake/plugins.cmake
+++ cmake/plugins.cmake
@@ -47,9 +47,7 @@
     set(PLUGIN_${CC_PLUGIN_TARGET}_TYPE ${CC_PLUGIN_TYPE})

     if(${CC_PLUGIN_DEFAULT} STREQUAL "DYNAMIC")
-      set_source_files_properties(${CC_PLUGIN_SOURCES}
-                                 PROPERTIES COMPILE_FLAGS
-                                 "-DPLUGIN_DYNAMIC=1 ${CC_PLUGIN_COMPILE_OPTIONS}")
+
       set(PLUGINS_DYNAMIC ${PLUGINS_DYNAMIC} ${CC_PLUGIN_TARGET} PARENT_SCOPE)
       if(WIN32)
         set(target ${CC_PLUGIN_TARGET})
@@ -65,6 +63,9 @@
       add_library(${CC_PLUGIN_TARGET} MODULE ${CC_PLUGIN_SOURCES})
       target_link_libraries(${CC_PLUGIN_TARGET} ${CC_PLUGIN_LIBRARIES})
       set_target_properties(${CC_PLUGIN_TARGET} PROPERTIES PREFIX "")
+      set_target_properties(${CC_PLUGIN_TARGET}
+                                 PROPERTIES COMPILE_FLAGS
+                                 "-DPLUGIN_DYNAMIC=1 ${CC_PLUGIN_COMPILE_OPTIONS}")
       if (NOT "${CC_PLUGIN_INCLUDES}" STREQUAL "")
         if(CMAKE_VERSION VERSION_LESS 2.8.11)
           include_directories(${CC_PLUGIN_INCLUDES})


COMP: Support multiple find_package(Gengetopt)

The following should not produce any error:
```
cmake_minimum_required(VERSION 3.15)

project(testFindGengetopt)

list(APPEND CMAKE_MODULE_PATH "${RTK_SOURCE_DIR}/cmake")
include("${RTK_SOURCE_DIR}/cmake/rtkCompilerFlags.cmake")
find_package(Gengetopt REQUIRED)
find_package(Gengetopt REQUIRED)
```

--- cmake/FindGengetopt.cmake
+++ cmake/FindGengetopt.cmake
@@ -1,16 +1,17 @@
-
 # Attempt to find gengetopt. If not found, compile it.
-find_program(GENGETOPT gengetopt)
-if ((GENGETOPT STREQUAL "GENGETOPT-NOTFOUND") OR (GENGETOPT STREQUAL ""))
-  get_filename_component(CLITK_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
-  add_subdirectory(${CLITK_CMAKE_DIR}/../utilities/gengetopt ${CMAKE_CURRENT_BINARY_DIR}/gengetopt)
-else()
-  if(EXISTS ${GENGETOPT})
-    add_executable(gengetopt IMPORTED)
-    set_property(TARGET gengetopt PROPERTY IMPORTED_LOCATION ${GENGETOPT})
+if (NOT TARGET gengetopt)
+  find_program(GENGETOPT gengetopt)
+  if ((GENGETOPT STREQUAL "GENGETOPT-NOTFOUND") OR (GENGETOPT STREQUAL ""))
+    get_filename_component(CLITK_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+    add_subdirectory(${CLITK_CMAKE_DIR}/../utilities/gengetopt ${CMAKE_CURRENT_BINARY_DIR}/gengetopt)
   else()
-	  set(GENGETOPT "GENGETOPT-NOTFOUND" CACHE FILEPATH "Path to a program." FORCE)
-    message(FATAL_ERROR "No gengetopt executable found at the specified location")
+    if(EXISTS ${GENGETOPT})
+      add_executable(gengetopt IMPORTED)
+      set_property(TARGET gengetopt PROPERTY IMPORTED_LOCATION ${GENGETOPT})
+    else()
+      set(GENGETOPT "GENGETOPT-NOTFOUND" CACHE FILEPATH "Path to a program." FORCE)
+      message(FATAL_ERROR "No gengetopt executable found at the specified location")
+    endif()
   endif()
 endif()


Revert "Temporarily disable Boost::ASIO on Mac"

This reverts commit 1b931f2f1cdb3d4856ad913ffe81deeeb91ca70b.

--- cmake/HalleyProject.cmake
+++ cmake/HalleyProject.cmake
@@ -142,9 +142,8 @@
 endif ()

 if (APPLE)
-	set(USE_AVFOUNDATION 1)
-	set(USE_METAL 1)
-	set(USE_ASIO 0)
+  set(USE_AVFOUNDATION 1)
+  set(USE_METAL 1)
 endif ()

 # Libs


[CMake] do not print install targets

[CMake] do not print install targets

--- cmake/MapnikInstall.cmake
+++ cmake/MapnikInstall.cmake
@@ -18,7 +18,6 @@
         )
     endif()
     if(NOT MAPNIK_INSTALL_IS_PLUGIN)
-        message(STATUS "${MAPNIK_INSTALL_TARGET}")
         get_target_property(TARGET_TYPE "${MAPNIK_INSTALL_TARGET}" TYPE)
         if (TARGET_TYPE STREQUAL "EXECUTABLE")
             get_property(MAPNIK_INSTALLED_TARGETS GLOBAL PROPERTY TARGETS)


Revert "Merge branch 'ju/fix_disabling_test_targets' into 'master'"

This reverts merge request !101

--- cmake/qibuild/tests.cmake
+++ cmake/qibuild/tests.cmake
@@ -70,10 +70,6 @@
 #
 # Arguments are the same as :cmake:function:`qi_create_lib`
 function(qi_create_test_lib target_name)
-  if(NOT QI_WITH_TESTS)
-    return()
-  endif()
-
   qi_create_lib(${target_name} ${ARGN} NO_INSTALL)

   if(WIN32)


handle when the error is not fatal in rospack. e.g. [rospack] Failed to change UID; cache permissions may need to be adjusted manually. setuid(): Operation not permitted

--- cmake/rosbuild_lite.cmake
+++ cmake/rosbuild_lite.cmake
@@ -61,10 +61,14 @@
         ERROR_VARIABLE rospack_error
         OUTPUT_STRIP_TRAILING_WHITESPACE
         ERROR_STRIP_TRAILING_WHITESPACE
+        RESULT_VARIABLE rospack_error_code
         )
       _unset_ros_env()
+      if(${rospack_error_code} EQUAL 0)
+        unset(rospack_error)
+        unset(rospack_error_code)
+      endif()
     endif()
-
     if(rospack_error)
       message(STATUS "***")
       message(STATUS "*** rospack ${COMMAND} ${PACKAGE} failed: ${rospack_error}")
@@ -151,8 +155,13 @@
       ERROR_VARIABLE rosmsg_error
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_STRIP_TRAILING_WHITESPACE
+      RESULT_VARIABLE rosmsg_error_code
       )
     _unset_ros_env()
+    if(${rosmsg_error_code} EQUAL 0)
+      unset(rosmsg_error)
+      unset(rosmsg_error_code)
+    endif()
   endif()
   if (rosmsg_error)
     message(WARNING "*** rosmsg ${CMD} ${PACKAGE} failed: ${rosmsg_error}")


build: windows: enable HTTP Server

build: windows: enable HTTP Server

Signed-off-by: Eduardo Silva <b6525c140147034c280e3cd2f39161f32f3f4f62@gmail.com>

--- cmake/windows-setup.cmake
+++ cmake/windows-setup.cmake
@@ -10,7 +10,7 @@
 set(FLB_PARSER                Yes)
 set(FLB_TLS                   Yes)
 set(FLB_AWS                   Yes)
-set(FLB_HTTP_SERVER            No)
+set(FLB_HTTP_SERVER           Yes)
 set(FLB_METRICS               Yes)

 # INPUT plugins


[FIX] reduce parallel jobs to 2 to save mem

--- util/travis/linux-cibuild.cmake
+++ util/travis/linux-cibuild.cmake
@@ -23,7 +23,7 @@

 # Use 4 build threads
-set(CTEST_BUILD_FLAGS -j4)
+set(CTEST_BUILD_FLAGS -j2)

 # we want makefiles
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")


forgot to remove the file also from the cmake list

--- src/rttr/rttr.cmake
+++ src/rttr/rttr.cmake
@@ -78,7 +78,6 @@
                  detail/type/type_converter.h
                  detail/type/type_database_p.h
                  detail/type/type_register.h
-                 detail/type/type_register_impl.h
                  impl/register_reflection_impl.h
                  impl/rttr_cast_impl.h
                  impl/type_impl.h


Update ITK superbuild version to after 5.2rc3

This version after 5.2rc3 contains fixes for gcc 4 and addresses
OpenJPEG compilation error with Visual Studio 16.9.

--- SuperBuild/External_ITK.cmake
+++ SuperBuild/External_ITK.cmake
@@ -61,7 +61,7 @@
 mark_as_advanced(ITK_GIT_REPOSITORY)
 sitk_legacy_naming(ITK_GIT_REPOSITORY ITK_REPOSITORY)

-set(_DEFAULT_ITK_GIT_TAG "v5.2rc02")
+set(_DEFAULT_ITK_GIT_TAG "22ca5dd83dc3ed0f6cebdc4dc82273f1068ef36e") # After 5.2rc3 tag
 set(ITK_GIT_TAG "${_DEFAULT_ITK_GIT_TAG}" CACHE STRING "Tag in ITK git repo")
 mark_as_advanced(ITK_GIT_TAG)
 set(ITK_TAG_COMMAND GIT_TAG "${ITK_GIT_TAG}")


fix for #8704, windows version info for tools all say condor_gpu_detection ===VersionInfo:pending===

--- build/cmake/macros/CondorExe.cmake
+++ build/cmake/macros/CondorExe.cmake
@@ -33,8 +33,8 @@
         STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" CONDOR_BUILD_NUMBER  "${VERSION}")
         set(CONDOR_EXECUTABLE_NAME ${_CNDR_TARGET})

-        CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/msconfig/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo_exe.rc)
-        list(APPEND _SRCS ${CMAKE_CURRENT_BINARY_DIR}/versioninfo_exe.rc)
+        CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/msconfig/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo_${CONDOR_EXECUTABLE_NAME}.rc)
+        list(APPEND _SRCS ${CMAKE_CURRENT_BINARY_DIR}/versioninfo_${CONDOR_EXECUTABLE_NAME}.rc)
     endif( WINDOWS )

     add_executable( ${_CNDR_TARGET} ${_SRCS})


Removing unneeded flatbuffers copts.

Removing unneeded flatbuffers copts.

--- build_tools/cmake/iree_copts.cmake
+++ build_tools/cmake/iree_copts.cmake
@@ -378,14 +378,6 @@
   set(FLATBUFFERS_BUILD_FLATC ON CACHE BOOL "" FORCE)
 endif()

-iree_select_compiler_opts(FLATBUFFERS_COPTS
-  CLANG
-    # Flatbuffers has a bunch of incorrect documentation annotations.
-    "-Wno-documentation"
-    "-Wno-documentation-unknown-command"
-)
-list(APPEND IREE_DEFAULT_COPTS ${FLATBUFFERS_COPTS})
-
 #-------------------------------------------------------------------------------
 # Third party: flatcc
 #-------------------------------------------------------------------------------


BUG: Export ITK_FFTW_INCLUDE_PATH as CMake path.

In FindFFTW.cmake, the FFTW_INCLUDE_PATH is converted to a CMake Path, i.e.
separated by unix /. This corrects that value of ITK_FFTW_INCLUDE_PATH on
Windows so the backslashes are not treated as escapes when that file is read
in.

Change-Id: I82d0297aa7d4d044db34437c32ff71147b425871

--- CMake/FindFFTW.cmake
+++ CMake/FindFFTW.cmake
@@ -22,11 +22,12 @@
   find_path(FFTW_INCLUDE_PATH fftw3.h ${FFTW_INC_SEARCHPATH})

   if(FFTW_INCLUDE_PATH)
+    file(TO_CMAKE_PATH "${FFTW_INCLUDE_PATH}" FFTW_INCLUDE_PATH)
     set(FFTW_INCLUDE ${FFTW_INCLUDE_PATH})
   endif()

   if(FFTW_INCLUDE)
-    include_directories( ${FFTW_INCLUDE})
+    include_directories(${FFTW_INCLUDE})
   endif()

   get_filename_component(FFTW_INSTALL_BASE_PATH ${FFTW_INCLUDE_PATH} PATH)


[NOP] space for hannes

[NOP] space for hannes

--- util/cmake/FindSeqAn.cmake
+++ util/cmake/FindSeqAn.cmake
@@ -168,30 +168,30 @@
 # Check required compiler versions.
 # ----------------------------------------------------------------------------

-if(CMAKE_COMPILER_IS_GNUCXX)
+if (CMAKE_COMPILER_IS_GNUCXX)

     # require at least gcc 4.9
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
         message(AUTHOR_WARNING "GCC version (${CMAKE_CXX_COMPILER_VERSION}) should be at least 4.9! Anything below is untested.")
-    endif()
+    endif ()

 elseif (COMPILER_IS_CLANG)

     # require at least clang 3.5
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
         message(AUTHOR_WARNING "Clang version (${CMAKE_CXX_COMPILER_VERSION}) should be at least 3.5! Anything below is untested.")
-    endif()
-
-elseif(COMPILER_IS_MSVC)
+    endif ()
+
+elseif (COMPILER_IS_MSVC)

     # require at least MSVC 19.0
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.0")
         message(FATAL_ERROR "MSVC version (${CMAKE_CXX_COMPILER_VERSION}) must be at least 19.0 (Visual Studio 2015)!")
-    endif()
-
-else()
+    endif ()
+
+else ()
     message(WARNING "You are using an unsupported compiler! Compilation has only been tested with >= Clang 3.5, >= GCC 4.9 and >= MSVC 19.0 (VS 2015).")
-endif()
+endif ()

 # ----------------------------------------------------------------------------
 # Compile-specific settings and workarounds around missing CMake features.


ADD lock simple mechanism for prevent simultaneous launch of continuous build

git-svn-id: ed1ce8e5c168003d808aec37bc6fda77b178f7bb@3537 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

--- trunk/test/openVibeTests.cmake
+++ trunk/test/openVibeTests.cmake
@@ -73,6 +73,8 @@

 ## -- DashBoard Root
 set(CTEST_DASHBOARD_ROOT                "${CMAKE_CURRENT_SOURCE_DIR}")
+
+

 # -----------------------------------------------------------
 # -- commands
@@ -147,6 +149,8 @@
 set( $ENV{LC_MESSAGES}      "en_EN" )

+
+
 # -----------------------------------------------------------
 # -- Run CTest
 # -----------------------------------------------------------
@@ -154,6 +158,15 @@
 ## -- Start
 message(" -- Start dashboard ${MODEL} - ${CTEST_BUILD_NAME} --")
 ctest_start(${MODEL} TRACK ${MODEL})
+
+## Test if another continuous test is not finished
+IF(${MODEL} MATCHES Continuous)
+	IF(NOT EXISTS "lock")
+		FILE(WRITE "lock" "remove if needed")
+	ELSE(NOT EXISTS "lock")
+		RETURN()
+	ENDIF(NOT EXISTS "lock")
+ENDIF(${MODEL} MATCHES Continuous)

 set(ALL_OK TRUE)
 ## -- Update
@@ -165,9 +178,11 @@
 		set(ALL_OK FALSE)
 	ENDIF(res EQUAL -1)
 	##  run build and test for continuous integration model only if there was a new update
-	#~ IF(res EQUAL 0 AND ${MODEL} MATCHES Continuous)
-		#~ RETURN()
-	#~ ENDIF(res EQUAL 0 AND ${MODEL} MATCHES Continuous)
+	IF(res EQUAL 0 AND ${MODEL} MATCHES Continuous)
+		# unlock before exit
+		FILE(REMOVE "lock")
+		RETURN()
+	ENDIF(res EQUAL 0 AND ${MODEL} MATCHES Continuous)
 ENDIF(ALL_OK)

@@ -204,7 +219,7 @@
 ## -- SUBMIT
 message(" -- Submit ${MODEL} - ${CTEST_BUILD_NAME} --")

-#ctest_submit(                                              RETURN_VALUE res)
+ctest_submit(                                              RETURN_VALUE res)
 message(STATUS "  INFO : submit(...) returned '${res}'")

 message(" -- Finished ${MODEL}  - ${CTEST_BUILD_NAME} --")
@@ -216,4 +231,7 @@
 	exec_program("rm" ARGS "-rf ${CTEST_SOURCE_DIRECTORY}" OUTPUT_VARIABLE "cleanScript")
 ENDIF(${MODEL} MATCHES Nightly)

-
+## unlock if continous build
+IF(${MODEL} MATCHES Continuous)
+	FILE(REMOVE "lock")
+ENDIF(${MODEL} MATCHES Continuous)


Rename uninstall target so it is unique per project (#188)

* Rename uninstall target so it is unique per project

Fixes #127
Signed-off-by: Dan Rose <2591e5f46f28d303f9dc027d475a5c60d8dea17a@digilabs.io>

* Revert whitespace change

Signed-off-by: Dan Rose <2591e5f46f28d303f9dc027d475a5c60d8dea17a@digilabs.io>

* add cumulative uninstall target

Signed-off-by: Dan Rose <2591e5f46f28d303f9dc027d475a5c60d8dea17a@digilabs.io>

--- ament_cmake_core/ament_cmake_uninstall_target-extras.cmake
+++ ament_cmake_core/ament_cmake_uninstall_target-extras.cmake
@@ -31,7 +31,12 @@
     @ONLY
   )

+  if (NOT TARGET uninstall)
+    add_custom_target(uninstall)
+  endif()
+
   # register uninstall target to run generated CMake script
-  add_custom_target(uninstall
+  add_custom_target(${PROJECT_NAME}_uninstall
     COMMAND ${CMAKE_COMMAND} -P "${AMENT_CMAKE_UNINSTALL_TARGET_UNINSTALL_SCRIPT}")
+  add_dependencies(uninstall ${PROJECT_NAME}_uninstall)
 endif()


cmake: external_dependencies: setup_library: add option to checkout specific git branch

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

 function(setup_library SOURCE_TO_TEST)
     set(boolArgs HEADER_ONLY)
-    set(oneValueArgs NAME GIT_REPOSITORY TEST_LINK_LIBS)
+    set(oneValueArgs NAME GIT_REPOSITORY GIT_TAG TEST_LINK_LIBS)
     set(multiValueArgs WHEN)
     cmake_parse_arguments(LIB_SETUP "${boolArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

@@ -20,8 +20,13 @@
         return()
     endif()

+    if (NOT LIB_SETUP_GIT_TAG)
+        set(LIB_SETUP_GIT_TAG master)
+    endif()
+
     FetchContent_Declare(${LIB_SETUP_NAME}
-                         GIT_REPOSITORY ${LIB_SETUP_GIT_REPOSITORY})
+                         GIT_REPOSITORY ${LIB_SETUP_GIT_REPOSITORY}
+                         GIT_TAG ${LIB_SETUP_GIT_TAG})
     FetchContent_GetProperties(${LIB_SETUP_NAME})
     set(POPULATED "${LIB_SETUP_NAME}_POPULATED")
     if (NOT "${POPULATED}")


added missing options to find_program_required

--- cmake/find_program_required.cmake
+++ cmake/find_program_required.cmake
@@ -1,6 +1,6 @@
 function(find_program_required ARG_VAR ARG_PROGRAM_NAME)
-  parse_arguments(ARG "PATHS" "" ${ARGN})
-  find_program(${ARG_VAR} ${ARG_PROGRAM_NAME} PATHS ${ARG_PATHS})
+  parse_arguments(ARG "PATHS" "NO_DEFAULT_PATH;NO_CMAKE_FIND_ROOT_PATH" ${ARGN})
+  find_program(${ARG_VAR} ${ARG_PROGRAM_NAME} PATHS ${ARG_PATHS} ${ARG_NO_DEFAULT_PATH} ${ARG_NO_CMAKE_FIND_ROOT_PATH})
   if(NOT ${ARG_VAR})
     message(FATAL_ERROR "${ARG_PROGRAM_NAME} not found")
   else()


Blank.

Blank.

--- cmake/modules/CheckCompiler.cmake
+++ cmake/modules/CheckCompiler.cmake
@@ -139,7 +139,6 @@
   else()
     message(FATAL_ERROR "cxxmodules is not supported by this compiler")
   endif()
-
 endif(cxxmodules)

 #---Need to locate thead libraries and options to set properly some compilation flags----------------


oops 2

oops 2

--- cmake/modules/hunter_config.cmake
+++ cmake/modules/hunter_config.cmake
@@ -83,7 +83,6 @@
       hunter_pack_local_dir(
           LOCAL_DIR "${_hunter_LOCAL_DIR}"
           VERSION _hunter_VERSION
-          LOCALE_DIR_SOURCE_SUBDIR "${_hunter_LOCAL_DIR}"
       )
   endif()


Add 'Boost' version v1.69.0-p1

Add 'Boost' version v1.69.0-p1

--- cmake/projects/Boost/hunter.cmake
+++ cmake/projects/Boost/hunter.cmake
@@ -130,6 +130,17 @@
     PACKAGE_NAME
     Boost
     VERSION
+    "1.69.0-p1"
+    URL
+    "https://github.com/hunter-packages/boost/archive/v1.69.0-p1.tar.gz"
+    SHA1
+    7f3a890d698912516f45effb3c88a8b6f93ed2da
+)
+
+hunter_add_version(
+    PACKAGE_NAME
+    Boost
+    VERSION
     "1.70.0-p0"
     URL
     "https://github.com/hunter-packages/boost/archive/v1.70.0-p0.tar.gz"


remove -Werror for now

remove -Werror for now

--- cmake/unix_compiler_options.cmake
+++ cmake/unix_compiler_options.cmake
@@ -1,4 +1,4 @@
-set(PDAL_COMMON_CXX_FLAGS "-Werror -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wredundant-decls -Wno-long-long -Wno-unknown-pragmas -isystem /usr/local/include"
+set(PDAL_COMMON_CXX_FLAGS "-Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wredundant-decls -Wno-long-long -Wno-unknown-pragmas -isystem /usr/local/include"
 )

 if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")


Updated for the 5.9.5 release

Updated for the 5.9.5 release

svn path=/trunk/; revision=10371

--- cmake/modules/plplot_version.cmake
+++ cmake/modules/plplot_version.cmake
@@ -43,7 +43,7 @@
 set(qsastime_VERSION ${qsastime_SOVERSION}.0.1)

 set(plplot_SOVERSION 9)
-set(plplot_VERSION ${plplot_SOVERSION}.6.2)
+set(plplot_VERSION ${plplot_SOVERSION}.7.0)

 set(plplotcxx_SOVERSION 9)
 set(plplotcxx_VERSION ${plplotcxx_SOVERSION}.3.0)


updated ZerMQ

updated ZerMQ

--- cmake/projects/ZeroMQ/hunter.cmake
+++ cmake/projects/ZeroMQ/hunter.cmake
@@ -39,6 +39,17 @@
     14ce51a8940f9f23d821a3363c128a51bfafa257
 )

+hunter_add_version(
+    PACKAGE_NAME
+    ZeroMQ
+    VERSION
+    "4.2.3-p5"
+    URL
+    "https://github.com/fwinnen/libzmq/releases/download/v4.2.3-hunter-5/libzmq-4.2.3-hunter-5.tar.gz"
+    SHA1
+    38e2cd74c0acfe6e5667c27a73112373a922dadf
+)
+
 hunter_cmake_args(ZeroMQ CMAKE_ARGS ZMQ_BUILD_TESTS=OFF)
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(ZeroMQ)


CMake: Reorder the search for llvm-config to search from latest version

--- cmake/LLVM.cmake
+++ cmake/LLVM.cmake
@@ -36,11 +36,11 @@
   # search for any version
   find_program(LLVM_CONFIG
     NAMES "llvm-config"
+      "llvm-config-mp-3.6" "llvm-config-3.6" "llvm-config36"
+      "llvm-config-mp-3.5" "llvm-config-3.5" "llvm-config35"
+      "llvm-config-mp-3.4" "llvm-config-3.4" "llvm-config34"
+      "llvm-config-mp-3.3" "llvm-config-3.3" "llvm-config33"
       "llvm-config-mp-3.2" "llvm-config-3.2" "llvm-config32"
-      "llvm-config-mp-3.3" "llvm-config-3.3" "llvm-config33"
-      "llvm-config-mp-3.4" "llvm-config-3.4" "llvm-config34"
-      "llvm-config-mp-3.5" "llvm-config-3.5" "llvm-config35"
-      "llvm-config-mp-3.6" "llvm-config-3.6" "llvm-config36"
     DOC "llvm-config executable")
 endif()


CMake: Forgot one variable for Halide testsuite

--- cmake/LLVM.cmake
+++ cmake/LLVM.cmake
@@ -144,6 +144,7 @@

 # required for sources..
 if(LLVM_VERSION MATCHES "3[.]([0-9]+)")
+  set(LLVM_MAJOR 3)
   string(STRIP "${CMAKE_MATCH_1}" LLVM_MINOR)
   message(STATUS "Minor llvm version: ${LLVM_MINOR}")
   if(LLVM_MINOR STREQUAL "6")


remove cmake python output

remove cmake python output

--- cmake/util.cmake
+++ cmake/util.cmake
@@ -149,7 +149,6 @@
 # Create a python unittest using run_python_tests.sh,
 # which takes care of making correct running environment
 function(add_python_test TEST_NAME)
-    message("PYTHON: ${PYTHON_EXECUTABLE}")
     add_test(NAME ${TEST_NAME}
         COMMAND bash ${PROJ_ROOT}/paddle/scripts/run_python_tests.sh
         ${USE_VIRTUALENV_FOR_TEST} ${PYTHON_EXECUTABLE} ${ARGN}


BUG: EXTENSION subdirectory was incorrect

--- Common.cmake
+++ Common.cmake
@@ -16,7 +16,7 @@
 set(EXTENSION_SCREENSHOTURLS "http://www.nitrc.org/project/list_screenshots.php?group_id=534&screenshot_id=599 http://www.nitrc.org/project/list_screenshots.php?group_id=534&screenshot_id=597")
 set(EXTENSION_STATUS "Beta")
 set(EXTENSION_DEPENDS "NA") # Specified as a space separated list or 'NA' if any
-set(EXTENSION_BUILD_SUBDIRECTORY fvlight-build)
+set(EXTENSION_BUILD_SUBDIRECTORY FiberViewerLight-build)

 find_package(Git REQUIRED)


Issue #51: Turn all PCL except common OFF.

--- CMake/ExternalProjects/PCL.cmake
+++ CMake/ExternalProjects/PCL.cmake
@@ -73,7 +73,7 @@
       -DBUILD_outofcore:BOOL=OFF
       -DBUILD_people:BOOL=OFF
       -DBUILD_recognition:BOOL=OFF
-      -DBUILD_registration:BOOL=ON
+      -DBUILD_registration:BOOL=OFF
       -DBUILD_sample_consensus:BOOL=OFF
       -DBUILD_search:BOOL=OFF
       -DBUILD_segmentation:BOOL=OFF


waypoint ckin for stub generator

waypoint ckin for stub generator

--- CMake/Packages/UsingThorPP.cmake
+++ CMake/Packages/UsingThorPP.cmake
@@ -18,6 +18,11 @@
 #
 # Contact Information: info@zillians.com
 #
+
+INCLUDE_DIRECTORIES(
+    ${PROJECT_COMMON_SOURCE_DIR}/include/
+    ${PROJECT_FRAMEWORK_SOURCE_DIR}/include/
+    )

 SET(THORPP_EXTENSION ".lp")

@@ -52,12 +57,12 @@
     ENDIF()

     IF(NOT DEFINED __output_path)
-        MESSAGE(STATUS "no code-gen path specified -- generating to build path!")
+        MESSAGE(STATUS "no output path specified -- generating to build path!")
         SET(__output_path "${CMAKE_CURRENT_BINARY_DIR}")
     ENDIF()

     IF(NOT DEFINED __output_ext)
-        MESSAGE(STATUS "no code-gen extension specified -- generating without extension!")
+        MESSAGE(STATUS "no output extension specified -- generating without extension!")
     ENDIF()

     IF(DEFINED __target)
@@ -81,8 +86,8 @@
             MESSAGE(FATAL_ERROR "file must exist!")
         ENDIF()

-        SET(__input_stem "${__output_path}/${__input_name}") # do everything in code-gen path
-        STRING(REGEX REPLACE ${__input_ext} "_generated_1.cpp" gen_source_1 ${__input_stem})
+        SET(__input_stem "${__output_path}/${__input_name}") # do everything in output path
+        STRING(REGEX REPLACE ${__input_ext} "_intermediate.cpp" gen_source_1 ${__input_stem})
         STRING(REGEX REPLACE ${__input_ext} "${__output_ext}" gen_source_2 ${__input_stem})

         ###########


[benchmark] When building the benchmark suite via subcmake specify CLANG_EXEC.

Given that we already know the clang that we want the benchmark suite to use,
just specify it explicitly.

rdar://40541972

--- cmake/modules/SwiftExternalBenchmarkBuild.cmake
+++ cmake/modules/SwiftExternalBenchmarkBuild.cmake
@@ -84,6 +84,7 @@
       -DSWIFT_LIBRARY_PATH=${SWIFT_BINARY_DIR}/lib/swift
       -DCMAKE_C_COMPILER=${PATH_TO_CLANG_BUILD}/bin/clang
       -DCMAKE_CXX_COMPILER=${PATH_TO_CLANG_BUILD}/bin/clang++
+      -DCLANG_EXEC=${PATH_TO_CLANG_BUILD}/bin/clang
       -DSWIFT_BENCHMARK_SUBCMAKE_BUILD=TRUE
     PASSTHROUGH_PREFIXES SWIFT_BENCHMARK
     )


COMP: Fixed MSVC warnings, "warning D9025: overriding '/W1' with '/w'"

The original itk_module_warnings_disable macro would remove all "/W[0-4]" compiler flags, but then Visual Studio (both VS2010 and VS2013) would automatically (!) add "/W1", causing these "D9025" warnings. Visual Studio does not do so when itk_module_warnings_disable adds "/W0" instead.

Discussed at "[ITK] ITKModuleMacros.cmake macro(itk_module_warnings_disable) MSVC warning D9025: overriding '/W1' with '/w'", http://public.kitware.com/pipermail/community/2015-February/008349.html
Mike Jackson confirmed the issue at http://public.kitware.com/pipermail/community/2015-February/008361.html

Change-Id: Ib68500022faef9768b7f9217316bf8ae6bae0d79

--- CMake/ITKModuleMacros.cmake
+++ CMake/ITKModuleMacros.cmake
@@ -211,7 +211,8 @@
   foreach(lang ${ARGN})
     if(MSVC)
       string(REGEX REPLACE "(^| )[/-]W[0-4]( |$)" " "
-        CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -w")
+        CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}")
+      set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} /W0")
     elseif(BORLAND)
       set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -w-")
     else()


ENH: When REMOTE_GIT_TAG_{name} is empty do not update remote

When the specified ITK remote module git tag string is "" then, don't
perform any git update. This allows work and commits to be done in the
ITK repository, with out the changes being reverted to a prior commit.

--- CMake/ITKModuleRemote.cmake
+++ CMake/ITKModuleRemote.cmake
@@ -161,7 +161,8 @@
 # in to override the value in the remote module configuration file.
 # The intent of the REMOTE_GIT_TAG_${_name} variable override is to
 # facilitate testing of remote module branch behaviors without
-# requiring changes to the ITK code base.
+# requiring changes to the ITK code base. If REMOTE_GIT_TAG_${name} is
+# "" then no git fetch or update will be performed.
 function(itk_fetch_module _name _description)
   include(CMakeParseArguments)
   cmake_parse_arguments(_fetch_options "" "MODULE_COMPLIANCE_LEVEL;GIT_REPOSITORY;GIT_TAG" "" ${ARGN})
@@ -228,11 +229,13 @@
       set_property(CACHE Module_${_name}_BUILD_EXAMPLES PROPERTY TYPE BOOL)
     endif()

-    _fetch_with_git("${GIT_EXECUTABLE}"
-      "${_fetch_options_GIT_REPOSITORY}"
-      "${REMOTE_GIT_TAG}"
-      "${ITK_SOURCE_DIR}/Modules/Remote/${_name}"
-      )
+    if (NOT REMOTE_GIT_TAG STREQUAL "")
+      _fetch_with_git("${GIT_EXECUTABLE}"
+        "${_fetch_options_GIT_REPOSITORY}"
+        "${REMOTE_GIT_TAG}"
+        "${ITK_SOURCE_DIR}/Modules/Remote/${_name}"
+        )
+    endif()
   else()
     # Hide remote module options if not building.
     if(DEFINED REMOTE_GIT_TAG_${_name})


Also build old-style-connect check when on MSVC

It works fine

--- ClazySources.cmake
+++ ClazySources.cmake
@@ -77,3 +77,5 @@
   ${CMAKE_CURRENT_LIST_DIR}/checks/ruleofbase.cpp
   ${CMAKE_CURRENT_LIST_DIR}/Clazy.cpp
 )
+
+set(CLAZY_SRCS ${CLAZY_SRCS}  ${CMAKE_CURRENT_LIST_DIR}/checks/level2/oldstyleconnect.cpp)


Do not install AIRS headers and libraries.

Any installed files become part of the package made by cpack,
and we only want the app bundle to be packaged.

--- thirdparty/airs/CMake/AIRSCommonBlock.cmake
+++ thirdparty/airs/CMake/AIRSCommonBlock.cmake
@@ -53,7 +53,7 @@
       COMMANDS "${Kit_TCL_EXTRA_CMDS}")
     ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
     TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
-    INSTALL_TARGETS(/lib/vtk vtk${KIT}TCL)
+    #INSTALL_TARGETS(/lib/vtk vtk${KIT}TCL)
     SUBDIR_DEPENDS(Wrapping/Tcl vtk${KIT})
   ENDIF(VTK_MAJOR_VERSION GREATER 4)
 ENDIF(VTK_WRAP_TCL)
@@ -96,7 +96,7 @@
       TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS}
         ${PYTHON_LIBRARY})
       TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
-      INSTALL_TARGETS(/lib/vtk vtk${KIT}PythonD)
+      #INSTALL_TARGETS(/lib/vtk vtk${KIT}PythonD)
     ELSE (APPLE)
       ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS}
         ${Kit_PYTHON_EXTRA_SRCS})
@@ -110,7 +110,7 @@
     IF(WIN32 AND NOT CYGWIN)
       SET_TARGET_PROPERTIES(vtk${KIT}Python PROPERTIES SUFFIX ".pyd")
     ENDIF(WIN32 AND NOT CYGWIN)
-    INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
+    #INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
   ENDIF(VTK_MAJOR_VERSION GREATER 4)
 ENDIF (VTK_WRAP_PYTHON)

@@ -133,14 +133,14 @@
     VTK_WRAP_JAVA2(vtk${KIT}Java KitJava_SRCS ${Kit_SRCS})
     ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
     TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
-    INSTALL_TARGETS(/lib/vtk vtk${KIT}Java)
+    #INSTALL_TARGETS(/lib/vtk vtk${KIT}Java)
   ENDIF(VTK_MAJOR_VERSION GREATER 4)
 ENDIF (VTK_WRAP_JAVA)

 TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS} ${KIT_EXTRA_LIBS})

-INSTALL_TARGETS(/lib/vtk vtk${KIT})
-INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
+#INSTALL_TARGETS(/lib/vtk vtk${KIT})
+#INSTALL_FILES(/include/vtk .h ${Kit_SRCS})

 # If the user defined a custom macro, execute it now and pass in all the srcs
 #


Set emscripten optimization flag to -Os (from -O3)

--- cmake-toolchains/emscripten.toolchain.cmake
+++ cmake-toolchains/emscripten.toolchain.cmake
@@ -169,30 +169,30 @@

 # c++ compiler flags
 set(CMAKE_CXX_FLAGS "${EMSCRIPTEN_CONFIG_OPTION} ${EMSCRIPTEN_CACHE_OPTION} ${EMSCRIPTEN_TRACING_OPTION} -std=c++11 -stdlib=libc++ ${FIPS_EMSC_EXCEPTION_FLAGS} -fstrict-aliasing -Wall -Wno-warn-absolute-paths -Wno-multichar -Wextra -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-long-long -Wno-overloaded-virtual -Wno-deprecated-writable-strings -Wno-unused-volatile-lvalue -Wno-inconsistent-missing-override")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
-set(CMAKE_CXX_FLAGS_DEBUG "-O3 -g -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1")
-set(CMAKE_CXX_FLAGS_PROFILING "-O3 --profiling")
+set(CMAKE_CXX_FLAGS_RELEASE "-Os -DNDEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG "-Os -g -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1")
+set(CMAKE_CXX_FLAGS_PROFILING "-Os --profiling")

 # c compiler flags
 set(CMAKE_C_FLAGS "${EMSCRIPTEN_CONFIG_OPTION} ${EMSCRIPTEN_CACHE_OPTION} ${EMSCRIPTEN_TRACING_OPTION} -fstrict-aliasing -Wall -Wno-warn-absolute-paths -Wextra -Wno-multichar -Wno-unused-parameter -Wno-unknown-pragmas -Wno-ignored-qualifiers -Wno-long-long -Wno-overloaded-virtual -Wno-deprecated-writable-strings -Wno-unused-volatile-lvalue")
-set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
-set(CMAKE_C_FLAGS_DEBUG "-O3 -g -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1")
-set(CMAKE_C_FLAGS_PROFILING "-O3 --profiling")
+set(CMAKE_C_FLAGS_RELEASE "-Os -DNDEBUG")
+set(CMAKE_C_FLAGS_DEBUG "-Os -g -D_DEBUG_ -D_DEBUG -DFIPS_DEBUG=1")
+set(CMAKE_C_FLAGS_PROFILING "-Os --profiling")

 # linker flags
 set(CMAKE_EXE_LINKER_FLAGS "${EMSCRIPTEN_CONFIG_OPTION} ${EMSCRIPTEN_CACHE_OPTION} ${EMSCRIPTEN_TRACING_OPTION} --memory-init-file ${EMSCRIPTEN_USE_MEMORY_INIT_FILE} -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s TOTAL_MEMORY=${EMSCRIPTEN_TOTAL_MEMORY} -s DISABLE_EXCEPTION_CATCHING=${EMSCRIPTEN_DISABLE_EXCEPTION_CATCHING} -s NO_FILESYSTEM=${EMSCRIPTEN_NO_FILESYSTEM}")
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT} --closure ${EMSCRIPTEN_USE_CLOSURE}")
-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-O3 -g -s ASM_JS=1 -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE}")
-set(CMAKE_EXE_LINKER_FLAGS_PROFILING "--profiling -O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")
+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Os --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT} --closure ${EMSCRIPTEN_USE_CLOSURE}")
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-Os -g -s ASM_JS=1 -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE}")
+set(CMAKE_EXE_LINKER_FLAGS_PROFILING "--profiling -Os --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")

 # static library flags (for CMAKE_AR)
 set(CMAKE_STATIC_LINKER_FLAGS "${EMSCRIPTEN_CONFIG_OPTION}")

 # dynamic lib linker flags
 set(CMAKE_SHARED_LINKER_FLAGS "-shared ${EMSCRIPTEN_CONFIG_OPTIONS} ${EMSCRIPTEN_CACHE_OPTION} ${EMSCRIPTEN_TRACING_OPTION} --memory-init-file 0 -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s TOTAL_MEMORY=${EMSCRIPTEN_TOTAL_MEMORY_WORKER} -s BUILD_AS_WORKER=1 -s EXPORTED_FUNCTIONS=[\\\"_dowork\\\"] -s DISABLE_EXCEPTION_CATCHING=${EMSCRIPTEN_DISABLE_EXCEPTION_CATCHING} -s NO_FILESYSTEM=${EMSCRIPTEN_NO_FILESYSTEM}")
-set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "-O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT} --closure ${EMSCRIPTEN_USE_CLOSURE}")
-set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-O3 -g -s ASM_JS=1 -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} --closure 0")
-set(CMAKE_SHARED_LINKER_FLAGS_PROFILING "--profiling -O3 --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Os --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT} --closure ${EMSCRIPTEN_USE_CLOSURE}")
+set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-Os -g -s ASM_JS=1 -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} --closure 0")
+set(CMAKE_SHARED_LINKER_FLAGS_PROFILING "--profiling -Os --llvm-lto ${EMSCRIPTEN_LTO_LEVEL} -s VERBOSE=${EMSCRIPTEN_BUILD_VERBOSE} -s ASM_JS=1 -s ASSERTIONS=${EMSCRIPTEN_ASSERTIONS} -s OUTLINING_LIMIT=${EMSCRIPTEN_OUTLINING_LIMIT}")

 # update cache variables for cmake gui
 set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Config Type" FORCE)


Revert "USB bootloader with support for missing 24MHz USB osc (OAK-D Pro-PoE initial flashing)"

This reverts commit 96691b9a8295c54bea1c04c20bc4ad60091ca536.

--- cmake/Depthai/DepthaiBootloaderConfig.cmake
+++ cmake/Depthai/DepthaiBootloaderConfig.cmake
@@ -1,7 +1,7 @@
 # Maturity level "snapshot" / "release"
-#set(DEPTHAI_BOOTLOADER_MATURITY "release")
-set(DEPTHAI_BOOTLOADER_MATURITY "snapshot")
+set(DEPTHAI_BOOTLOADER_MATURITY "release")
+#set(DEPTHAI_BOOTLOADER_MATURITY "snapshot")

 # "version if applicable"
-#set(DEPTHAI_BOOTLOADER_VERSION "0.0.15")
-set(DEPTHAI_BOOTLOADER_VERSION "bb9e4c86ce3c22da0aeb92dc18c8b28458bed4af")
+set(DEPTHAI_BOOTLOADER_VERSION "0.0.15")
+#set(DEPTHAI_BOOTLOADER_VERSION "870bec4ca0ef026ddb9c490a38dfe9d097614554")


fix(zanata): fix duplicate zanata_push target

--- Modules/ManageZanata.cmake
+++ Modules/ManageZanata.cmake
@@ -664,7 +664,7 @@
 	DEPENDS ${zanataXml}
 	)

-    ### zanata_push_both
+    ### zanata_pull_both
     SET(extraOptions "")
     ZANATA_CLIENT_OPTNAME_LIST_APPEND(extraOptions "PULL_TYPE" "both")
     ADD_CUSTOM_TARGET(zanata_pull_both
@@ -706,7 +706,7 @@

     ### zanata_put_version
     MANAGE_ZANATA_OBTAIN_PUT_VERSION_COMMAND(cmdPushList _o)
-    MANAGE_ZANATA_PUSH_TARGETS("${cmdPushList}")
+    MANAGE_ZANATA_PUT_VERSION_TARGETS("${cmdPushList}")

     ### zanata_push
     MANAGE_ZANATA_OBTAIN_PUSH_COMMAND(cmdPushList _o)
@@ -931,7 +931,6 @@

     MANAGE_ZANATA_XML_OBJECT_NEW(zObj ${url} ${project} ${version} ${projectType})

-
     ## Build "Client Hash"
     MANAGE_GETTEXT_LOCALES(clientLocales WORKING_DIRECTORY "${workDir}" DETECT_PO_DIR poDir ${ARGN})
     IF(NOT "${srcDirOrig}" STREQUAL "")


"Fix incorrect cut_common usage with cut/common"

--- cut_common.cmake
+++ cut_common.cmake
@@ -37,7 +37,7 @@

 # --- static
 add_lib(cut_common_s STATIC ${cut_common_src} ${cut_common_int_hdr} ${cut_common_exp_hdr})
-add_lib_build_def(cut_common_s include/cut/cut_common/exportsym.h CUT_COMMON)
+add_lib_build_def(cut_common_s include/cut/common/exportsym.h CUT_COMMON)
 add_comp_def(cut_common_s CUT_COMMON_MAJ=${cut_common_maj_ver})
 add_comp_def(cut_common_s CUT_COMMON_MIN=${cut_common_min_ver})
 add_comp_def(cut_common_s CUT_COMMON_PAT=${cut_common_pat_ver})


Issue #4017: Compiler args are passed down to external projects

--- CMake/SuperBuild.cmake
+++ CMake/SuperBuild.cmake
@@ -52,6 +52,8 @@
   -DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
   -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
   -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+  -DCMAKE_C_COMPILER_ARG1:STRING=${CMAKE_C_COMPILER_ARG1}
+  -DCMAKE_CXX_COMPILER_ARG1:STRING=${CMAKE_CXX_COMPILER_ARG1}
   -DCMAKE_C_FLAGS:STRING=${EP_COMMON_C_FLAGS}
   -DCMAKE_CXX_FLAGS:STRING=${EP_COMMON_CXX_FLAGS}
   -DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}


Determine OGRE_DEP_DIR relative to OIS in case someone uses one of the alternate auto locations

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -14,11 +14,9 @@
   return()
 endif()

-if (OGRE_DEPENDENCIES_DIR)
-	set(OGRE_DEP_DIR ${OGRE_DEPENDENCIES_DIR})
-else()
-	set(OGRE_DEP_DIR "${OGRE_SOURCE_DIR}/Dependencies")
-endif()
+# TODO - most of this file assumes a common dependencies root folder
+# This is not robust, we should instead source dependencies from their individual locations
+get_filename_component(OGRE_DEP_DIR ${OIS_INCLUDE_DIR}/../../ ABSOLUTE)

 option(OGRE_INSTALL_DEPENDENCIES "Install dependency libs needed for samples" TRUE)
 option(OGRE_COPY_DEPENDENCIES "Copy dependency libs to the build directory" TRUE)


respect FreeImage config in AndroidMacro

--HG--
branch : nostaticzlib

--- CMake/Utils/AndroidMacros.cmake
+++ CMake/Utils/AndroidMacros.cmake
@@ -47,8 +47,12 @@
 	if(OGRE_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER)
         add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_ABI@"  "glsl_optimizer" "glcpp-library" "mesa")
 	endif()
-
-	add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_ABI@" "OIS" "freetype" "FreeImage" "zzip")
+
+	if(OGRE_CONFIG_ENABLE_FREEIMAGE)
+        add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_ABI@" "FreeImage")
+    endif()
+
+	add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_ABI@" "OIS" "freetype" "zzip")

     if(APPLE OR WIN32)
       SET(ANDROID_EXECUTABLE "android")


Update MatchPoint Fixes T22463

Update MatchPoint Fixes T22463

--- CMakeExternals/MatchPoint.cmake
+++ CMakeExternals/MatchPoint.cmake
@@ -26,8 +26,8 @@
       set(download_step SOURCE_DIR ${MatchPoint_SOURCE_DIR})
     else()
       set(download_step
-          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev1610.tar.gz
-          URL_MD5 a9508c8d9ab58a20cf8fa45adb972a02
+          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev1681.tar.gz
+          URL_MD5 fa18c890751a192ac72803d115a1c702
          )
     endif()


Make Globebrowsing a default module (closes #324)

--- modules/globebrowsing/include.cmake
+++ modules/globebrowsing/include.cmake
@@ -1,3 +1,4 @@
+set (DEFAULT_MODULE ON)
 set (OPENSPACE_DEPENDENCIES
     debugging
     space


Tweak ctest/cdash script for travis

Tweak ctest/cdash script for travis

--- Testing/travis_script.cmake
+++ Testing/travis_script.cmake
@@ -10,12 +10,15 @@
 if(NOT MERCURY_BUILD_CONFIGURATION)
   set(MERCURY_BUILD_CONFIGURATION "Debug")
 endif()
+string(TOLOWER ${MERCURY_BUILD_CONFIGURATION} lower_mercury_build_configuration)
+set(CTEST_BUILD_CONFIGURATION ${MERCURY_BUILD_CONFIGURATION})

 # MERCURY_DASHBOARD_MODEL=Experimental | Nightly | Continuous
 set(MERCURY_DASHBOARD_MODEL "$ENV{MERCURY_DASHBOARD_MODEL}")
 if(NOT MERCURY_DASHBOARD_MODEL)
   set(MERCURY_DASHBOARD_MODEL "Experimental")
 endif()
+set(dashboard_model ${MERCURY_DASHBOARD_MODEL})

 # Disable loop when MERCURY_DASHBOARD_MODEL=Continuous
 set(MERCURY_NO_LOOP $ENV{MERCURY_NO_LOOP})
@@ -24,19 +27,17 @@
   set(dashboard_disable_loop TRUE)
 endif()

+# Number of jobs to build
+set(CTEST_BUILD_FLAGS "-j4")
+
+# Build name referenced in cdash
+set(CTEST_BUILD_NAME "$ENV{TRAVIS_OS_NAME}-x64-${lower_mercury_build_configuration}-$ENV{TRAVIS_BUILD_NUMBER}")
+
 # Build shared libraries
 set(mercury_build_shared ON)
-
-string(TOLOWER ${MERCURY_BUILD_CONFIGURATION} lower_mercury_build_configuration)
-set(CTEST_BUILD_CONFIGURATION ${MERCURY_BUILD_CONFIGURATION})
-# Number of jobs to build
-set(CTEST_BUILD_FLAGS "-j4")
-# Build name referenced in cdash
-set(CTEST_BUILD_NAME "travis-x64-${lower_mercury_build_configuration}")
 set(MERCURY_BUILD_STATIC_LIBRARIES $ENV{MERCURY_BUILD_STATIC_LIBRARIES})
 if(MERCURY_BUILD_STATIC_LIBRARIES)
   message("Building static libraries")
-  set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-static")
   set(mercury_build_shared OFF)
 endif()

@@ -54,7 +55,6 @@
 if(MERCURY_DO_COVERAGE)
   message("Enabling Coverage")
   set(CTEST_COVERAGE_COMMAND "/usr/bin/gcov")
-  set(CTEST_BUILD_NAME "${CTEST_BUILD_NAME}-coverage")
   # don't run parallel coverage tests, no matter what.
   set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)

@@ -82,7 +82,6 @@
 if(NOT mercury_build_shared)
   set(dashboard_binary_name ${dashboard_binary_name}-static)
 endif()
-set(dashboard_model ${MERCURY_DASHBOARD_MODEL})

 # Initial cache used to build mercury, options can be modified here
 set(dashboard_cache "


[FIX] Don't strip binaries for osx.

[FIX] Don't strip binaries for osx.

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -313,6 +313,7 @@
     # strip binaries when packaging
     if ((CMAKE_BUILD_TYPE STREQUAL "Release") AND
         (NOT SEQAN_BUILD_SYSTEM STREQUAL "DEVELOP") AND
+        (NOT APPLE) AND
         (COMPILER_CLANG OR COMPILER_GCC))
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")
     endif ()


Revert linux-x86_64 support in NDK

Revert linux-x86_64 support in NDK

--- src/buildtools/toolchains/android.toolchain.cmake
+++ src/buildtools/toolchains/android.toolchain.cmake
@@ -365,12 +365,6 @@
  set( TOOL_OS_SUFFIX ".exe" )
 elseif( CMAKE_HOST_UNIX )
  set( ANDROID_NDK_HOST_SYSTEM_NAME "linux-x86" )
- if ( NOT EXISTS ${ANDROID_NDK}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME} )
-  set( ANDROID_NDK_HOST_SYSTEM_NAME "linux-x86_64" )
-  if ( NOT EXISTS ${ANDROID_NDK}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME} )
-   message( FATAL_ERROR "Linux architecture is not supported by this cmake toolchain" )
-  endif()
- endif()
 else()
  message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" )
 endif()


added cygwin specific stuff

added cygwin specific stuff

--- cmake/EigenTesting.cmake
+++ cmake/EigenTesting.cmake
@@ -96,7 +96,11 @@
   endif(${ARGC} GREATER 2)

   if(WIN32)
-    add_test(${testname} "${targetname}")
+    if(CYGWIN)
+      add_test(${testname} "${Eigen_SOURCE_DIR}/test/runtest.sh" "${testname}")
+    else(CYGWIN)
+      add_test(${testname} "${targetname}")
+    endif(CYGWIN)
   else(WIN32)
     add_test(${testname} "${Eigen_SOURCE_DIR}/test/runtest.sh" "${testname}")
   endif(WIN32)


cmake: resort MARK_AS_ADVANCED

cmake: resort MARK_AS_ADVANCED

--- cmake/ElektraCache.cmake
+++ cmake/ElektraCache.cmake
@@ -460,17 +460,25 @@
 	CMAKE_PIC_FLAGS
 	CMAKE_STATIC_FLAGS

-	# are kind of internal:
-	SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION
+	SWIG_EXECUTABLE
+	RONN_LOC
+
+	Boost_DIR
+	BOTAN_INCLUDE_DIRS
+	LIBGCRYPT_INCLUDE_DIR
+	XercesC_DIR
+	OPENSSL_INCLUDE_DIR
+	LUA_EXECUTABLE
+
+	# others are internal (not to be changed by users):
+	SWIG_DIR
+	SWIG_VERSION
 	gtest_build_samples gtest_build_tests gtest_disable_pthreads
 	gtest_force_shared_crt BUILD_SHARED_LIBS

-	ADDED_DIRECTORIES
-	ADDED_PLUGINS
-	REMOVED_PLUGINS
+	ADDED_DIRECTORIES ADDED_PLUGINS REMOVED_PLUGINS

 	LIBGCRYPTCONFIG_EXECUTABLE
-	RONN_LOC

 	jna

@@ -482,11 +490,4 @@
 	Qt5Test_DIR
 	Qt5Widgets_DIR
 	Qt5_DIR
-
-	Boost_DIR
-	BOTAN_INCLUDE_DIRS
-	LIBGCRYPT_INCLUDE_DIR
-	XercesC_DIR
-	OPENSSL_INCLUDE_DIR
-	LUA_EXECUTABLE
 	)


fix libevent path

fix libevent path

--- cmake/FindLibEvent.cmake
+++ cmake/FindLibEvent.cmake
@@ -12,9 +12,9 @@

 if(APPLE)
 	# support MacPorts
-	FIND_PATH(EVENT_INCLUDE_DIR event.h
+	FIND_PATH(EVENT_INCLUDE_DIR event2/event.h
 		PATHS
-		/opt/local/include/event2
+		/opt/local/include/
 		NO_CMAKE_SYSTEM_PATH
 	)
 	FIND_LIBRARY(EVENT_LIBRARIES NAMES event libevent
@@ -24,7 +24,7 @@
 	)
 endif(APPLE)

-FIND_PATH(EVENT_INCLUDE_DIR event.h PATHS /opt/local/include/event2)
+FIND_PATH(EVENT_INCLUDE_DIR event2/event.h PATHS /opt/local/include/)
 string(REGEX REPLACE "(.*)/include/?" "\\1" EVENT_INCLUDE_BASE_DIR "${EVENT_INCLUDE_DIR}")

 FIND_LIBRARY(EVENT_LIBRARIES NAMES event libevent


fixed CUDA compilation

fixed CUDA compilation

--- cmake/OpenCVModule.cmake
+++ cmake/OpenCVModule.cmake
@@ -213,10 +213,10 @@

         list(APPEND lib_hdrs ${lib_hdrs_detail})

-        if(HAVE_CUDA AND EXISTS "src/cuda/")
+        if(HAVE_CUDA AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/cuda")
             file(GLOB lib_cuda "src/cuda/*.cu")
             source_group("Cuda" FILES "${lib_cuda}")
-
+
             include_directories(${CUDA_INCLUDE_DIRS})
             include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/src")
             include_directories("${OpenCV_SOURCE_DIR}/modules/gpu/src/cuda")
@@ -247,7 +247,7 @@
         add_library(${the_target} ${OPENCV_${mname}_MODULE_TYPE} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${lib_cuda} ${cuda_objs})
         target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})

-        if(HAVE_CUDA AND EXISTS "src/cuda/")
+        if(HAVE_CUDA AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/cuda")
             target_link_libraries(${the_target} ${CUDA_LIBRARIES})

             unset(CUDA_npp_LIBRARY CACHE)


r10892/sofa : push 44cbc01..ddba438

r10892/sofa : push 44cbc01..ddba438

* commit ddba4384ba4715fb105ad3a07ae9d6efa0e8be79
cmake: use RegisterProjects() for gtest

   1 files changed, 1 insertions(+), 3 deletions(-)

Former-commit-id: 5ae1ec9be4cee9e450c608fc4bda1002afd46198

--- cmake/dependencies.cmake
+++ cmake/dependencies.cmake
@@ -44,9 +44,7 @@

 ## google test
 if(SOFA-MISC_BUILD_GTEST)
-    add_subdirectory("${SOFA_EXTLIBS_DIR}/gtest")
-    # try to replace with :
-    # RegisterProjects("gtest" "gtest_main" PATH "${SOFA_EXTLIBS_DIR}/gtest")
+    RegisterProjects("gtest" PATH "${SOFA_EXTLIBS_DIR}/gtest")

     if(MSVC)
         get_target_property(gtestCompilerDefines gtest COMPILE_DEFINITIONS)


CMake: minor fix

CMake: minor fix

--- cmake/globalconfig.cmake
+++ cmake/globalconfig.cmake
@@ -55,7 +55,7 @@
 endif()

 if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-    mesage(WARNING "Inviwo is only supported for 64-bit architectures.")
+    message(WARNING "Inviwo is only supported for 64-bit architectures.")
 endif()


ENH: Update elastix

ENH: Update elastix

--- SuperBuild/ExternalElastix.cmake
+++ SuperBuild/ExternalElastix.cmake
@@ -20,7 +20,7 @@
 set( proj Elastix )

 set( ELASTIX_GIT_REPOSITORY http://github.com/mstaring/elastix )
-set( ELASTIX_GIT_TAG fd5cde3060ca4093d4c904ead36b3a0dd2f63360 )
+set( ELASTIX_GIT_TAG 67e87e57b0dc90ff838de1c0cd6126b950dc12a1 )

 ExternalProject_Add( ${proj}
   GIT_REPOSITORY ${ELASTIX_GIT_REPOSITORY}


boost_ prefix not needed for linux - CMake automatically prepends it in.

--- cmake/ConfigurePackages.cmake
+++ cmake/ConfigurePackages.cmake
@@ -37,11 +37,7 @@
 set(Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1")
 set(Boost_USE_STATIC_LIBS TRUE)

-if (UNIX)
-   find_package(Boost 1.46.1 COMPONENTS boost_thread boost_regex)
-else()
-   find_package(Boost 1.46.1 COMPONENTS thread regex)
-endif()
+find_package(Boost 1.46.1 COMPONENTS thread regex)

 if (Boost_FOUND)
    include_directories(${Boost_INCLUDE_DIRS})


Fixed the header comment (standalone toolchain no longer required)

--- cmake/android.toolchain.cmake
+++ cmake/android.toolchain.cmake
@@ -1,9 +1,8 @@
 #-------------------------------------------------------------------------------
 #   android.toolchain.cmake
 #
-#   NOTE: this script expects the Android SDK, NDK and a standalone
-#   toolchain in the 'sdks' subdirectory as created by
-#   './oryol setup android'
+#   NOTE: this script expects the Android SDK and NDK in the 'sdks'
+#   subdirectory as created by './oryol setup android'
 #-------------------------------------------------------------------------------

 message("Target Platform: Android")


CMake: Remove string conversion flags

CMake: Remove string conversion flags

They are globally set in LXQtCompilerSettings.


Changed ensure_submodules to check for .git folder inside submodule (#517)

--- cmake/ensure_submodules.cmake
+++ cmake/ensure_submodules.cmake
@@ -29,9 +29,9 @@
 endif()

 foreach(EXTERNAL_PACKAGE ${EXTERNAL_PACKAGES})
-    if(NOT EXISTS ${GIT_REPO_DIR}/external/${EXTERNAL_PACKAGE})
+    if(NOT EXISTS ${GIT_REPO_DIR}/external/${EXTERNAL_PACKAGE}/.git)
         set(EXTERNAL_PACKAGES_FOUND False)
-        message(WARNING "Couldn't find external package external/${EXTERNAL_PACKAGE}...")
+        message(WARNING "Couldn't find .git folder in external package external/${EXTERNAL_PACKAGE}/.git ...")
     endif()
 endforeach()


cmake: warn user if CPPFLAGS is set as environment setting

Zephyr doesn't use CFLAGS, CXXFLAGS, and CPPFLAGS if they are defined
in environment.

In case user defines CFLAGS or CXXFLAGS in environment, then a warning
message is printed, however CPPFLAGS does not raise a warning.

CPPFLAGS is updated to follow the principle of CFLAGS and CXXFLAGS.

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

--- cmake/generic_toolchain.cmake
+++ cmake/generic_toolchain.cmake
@@ -11,7 +11,7 @@
 endif()

 # Don't inherit compiler flags from the environment
-foreach(var CFLAGS CXXFLAGS)
+foreach(var CFLAGS CXXFLAGS CPPFLAGS)
   if(DEFINED ENV{${var}})
     message(WARNING "The environment variable '${var}' was set to $ENV{${var}},
 but Zephyr ignores flags from the environment. Use 'cmake -DEXTRA_${var}=$ENV{${var}}' instead.")


Fix display message

Fix display message

svn path=/trunk/KDE/kdepim/; revision=642489

--- cmake/modules/FindBoost.cmake
+++ cmake/modules/FindBoost.cmake
@@ -28,9 +28,9 @@

 if (BOOST_FOUND)
-   if (NOT BOOST_FIND_QUIETLY)
+   if (NOT Boost_FIND_QUIETLY)
       message(STATUS "Found boost: ${BOOST_INCLUDE_DIR}")
-   endif (NOT BOOST_FIND_QUIETLY)
+   endif (NOT Boost_FIND_QUIETLY)
 endif (BOOST_FOUND)

 MARK_AS_ADVANCED(BOOST_INCLUDE_DIR BOOST_LIBRARIES)


[CMAKE] Fix the bench build for windows

[CMAKE] Fix the bench build for windows

Summary:
Event requires lib `ws2_32` on windows (as well as `shell32` and `advapi32`).
The missing `ws2_32` caused the bench to fail the build (`shell32` and `advapi32` are already added by other dependencies).

Test Plan: Run the Gitian builds.

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Subscribers: deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5525

--- cmake/modules/FindEvent.cmake
+++ cmake/modules/FindEvent.cmake
@@ -48,6 +48,12 @@
 		PATHS ${PC_Event_LIBRARY_DIRS}
 	)

+	set(_Event_WINDOWS_LIBRARIES "$<$<PLATFORM_ID:Windows>:ws2_32;shell32;advapi32>")
+	set_property(TARGET Event::event
+		PROPERTY INTERFACE_LINK_LIBRARIES ${_Event_WINDOWS_LIBRARIES}
+	)
+	list(APPEND Event_LIBRARIES ${_Event_WINDOWS_LIBRARIES})
+
 	pkg_check_modules(PC_Event_pthreads QUIET event_pthreads libevent_pthreads)
 	find_component(Event pthreads
 		NAMES event_pthreads


Use lowercase for local cmake variables.

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

--- cmake/platforms/Android.cmake
+++ cmake/platforms/Android.cmake
@@ -159,20 +159,18 @@
 # workaround. This creates a dummy libdl.a stub until the actual
 # libdl.a can be implemented in the toolchain.
 if( LLVM_BUILD_STATIC )
- set( ANDROID_LIBDL_STUB "${CMAKE_BINARY_DIR}/libdl_stub" )
- file( MAKE_DIRECTORY ${ANDROID_LIBDL_STUB} )
- file( WRITE "${ANDROID_LIBDL_STUB}/libdl.c" "
+ set( libdl "${CMAKE_BINARY_DIR}/libdl_stub" )
+ file( MAKE_DIRECTORY ${libdl} )
+ file( WRITE "${libdl}/libdl.c" "
 #include <dlfcn.h>
 void *       dlopen  (const char *filename, int flag)   { return 0; }
 const char * dlerror (void)                             { return 0; }
 void *       dlsym   (void *handle, const char *symbol) { return 0; }
 int          dlclose (void *handle)                     { return 0; }")
- set( SEPARATED_C_FLAGS "${CMAKE_C_FLAGS}" )
- separate_arguments( SEPARATED_C_FLAGS )
- execute_process( COMMAND ${CMAKE_C_COMPILER} ${SEPARATED_C_FLAGS} -c ${ANDROID_LIBDL_STUB}/libdl.c -o ${ANDROID_LIBDL_STUB}/libdl.o )
- execute_process( COMMAND ${CMAKE_AR} rcs ${ANDROID_LIBDL_STUB}/libdl.a ${ANDROID_LIBDL_STUB}/libdl.o )
- set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${ANDROID_LIBDL_STUB}" )
- unset( ANDROID_LIBDL_STUB )
- unset( SEPARATED_C_FLAGS )
+ set( flags "${CMAKE_C_FLAGS}" )
+ separate_arguments( flags )
+ execute_process( COMMAND ${CMAKE_C_COMPILER} ${flags} -c ${libdl}/libdl.c -o ${libdl}/libdl.o )
+ execute_process( COMMAND ${CMAKE_AR} rcs ${libdl}/libdl.a ${libdl}/libdl.o )
+ set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${libdl}" )
 endif()
 ################# END EVIL HACK ##################


removed newline in taskflow/plugin.cmake

--- girder/taskflow/plugin.cmake
+++ girder/taskflow/plugin.cmake
@@ -1,4 +1,3 @@
 add_python_test(task PLUGIN taskflow)
 add_python_test(taskflow PLUGIN taskflow)
-add_python_style_test(python_static_analysis_taskflow
-"${PROJECT_SOURCE_DIR}/plugins/taskflow/server")+add_python_style_test(python_static_analysis_taskflow "${PROJECT_SOURCE_DIR}/plugins/taskflow/server")


Update FindCUDA script to latest.

Update FindCUDA script to latest.

git-svn-id: bd2008fbba0f7d30fd6598b54f2cd88503fdd2e4@988 95f4ed2b-212e-0410-8b90-d31948207fce

--- cmake/FindCUDA.cmake
+++ cmake/FindCUDA.cmake
@@ -31,6 +31,10 @@
 # This script locates the Nvidia Compute Unified Driver Architecture (CUDA)
 # tools. It should work on linux, windows, and mac and should be reasonably
 # up to date with cuda releases.
+#
+# This script makes use of the standard find_package arguments of <VERSION>,
+# REQUIRED and QUIET.  CUDA_FOUND will report if an acceptable version of CUDA
+# was found.
 #
 # The script will prompt the user to specify CUDA_TOOLKIT_ROOT_DIR if the
 # prefix cannot be determined by the location of nvcc in the system path. To
@@ -94,7 +98,8 @@
 #    All of the specified source files and generated .cpp files are compiled
 #    using the standard CMake compiler, so the normal INCLUDE_DIRECTORIES,
 #    LINK_DIRECTORIES, and TARGET_LINK_LIBRARIES can be used to affect their
-#    build and link.
+#    build and link.  In addition CUDA_INCLUDE_DIRS is added automatically added
+#    to include_directories().
 #
 # CUDA_ADD_EXECUTABLE( cuda_target file0 file1 ... [OPTIONS ...] )
 # -- Same as CUDA_ADD_LIBRARY except that an exectuable is created.
@@ -175,7 +180,8 @@
 # CUDA_VERSION
 # CUDA_VERSION_STRING   -- CUDA_VERSION_MAJOR.CUDA_VERSION_MINOR
 #
-# CUDA_INCLUDE_DIRS     -- Include directory for cuda headers.
+# CUDA_INCLUDE_DIRS     -- Include directory for cuda headers.  Added automatically
+#                          for CUDA_ADD_EXECUTABLE and CUDA_ADD_LIBRARY.
 # CUDA_LIBRARIES        -- Cuda RT library.
 # CUDA_CUT_INCLUDE_DIR  -- Include directory for cuda SDK headers (cutil.h).
 # CUDA_CUT_LIBRARIES    -- SDK libraries.
@@ -424,8 +430,6 @@
 find_program(CUDA_NVCC_EXECUTABLE nvcc)
 mark_as_advanced(CUDA_NVCC_EXECUTABLE)

-message("CUDA_VERSION = ${CUDA_VERSION}")
-
 if(CUDA_NVCC_EXECUTABLE AND NOT CUDA_VERSION)
   # Compute the version.
   exec_program(${CUDA_NVCC_EXECUTABLE} ARGS "--version" OUTPUT_VARIABLE NVCC_OUT)
@@ -434,8 +438,6 @@
   set(CUDA_VERSION "${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}" CACHE STRING "Version of CUDA as computed from nvcc.")
   mark_as_advanced(CUDA_VERSION)
 endif()
-
-message("CUDA_VERSION = ${CUDA_VERSION}")

 # Always set this convenience variable
 set(CUDA_VERSION_STRING "${CUDA_VERSION}")
@@ -671,6 +673,23 @@
 endmacro()

 ##############################################################################
+# Helper to add the include directory for CUDA only once
+function(CUDA_ADD_CUDA_INCLUDE_ONCE)
+  get_directory_property(_include_directories INCLUDE_DIRECTORIES)
+  set(_add TRUE)
+  if(_include_directories)
+    foreach(dir ${_include_directories})
+      if("${dir}" STREQUAL "${CUDA_INCLUDE_DIRS}")
+        set(_add FALSE)
+      endif()
+    endforeach()
+  endif()
+  if(_add)
+    include_directories(${CUDA_INCLUDE_DIRS})
+  endif()
+endfunction()
+
+##############################################################################
 # This helper macro populates the following variables and setups up custom
 # commands and targets to invoke the nvcc compiler to generate C or PTX source
 # dependant upon the format parameter.  The compiler is invoked once with -M
@@ -896,6 +915,14 @@
         set(verbose_output OFF)
       endif()

+      # Create up the comment string
+      file(RELATIVE_PATH generated_file_relative_path "${CMAKE_BINARY_DIR}" "${generated_file}")
+      if(compile_to_ptx)
+        set(cuda_build_comment_string "Building NVCC ptx file ${generated_file_relative_path}")
+      else()
+        set(cuda_build_comment_string "Building NVCC (${cuda_build_type}) object ${generated_file_relative_path}")
+      endif()
+
       # Build the generated file and dependency file ##########################
       add_custom_command(
         OUTPUT ${generated_file}
@@ -910,7 +937,7 @@
           -D "generated_file:STRING=${generated_file}"
           -D "generated_cubin_file:STRING=${generated_cubin_file}"
           -P "${custom_target_script}"
-        COMMENT "Building (${cuda_build_type}) NVCC ${source_file}: ${generated_file}"
+        COMMENT "${cuda_build_comment_string}"
         )

       # Make sure the build system knows the file is generated.
@@ -952,6 +979,8 @@
 ###############################################################################
 macro(CUDA_ADD_LIBRARY cuda_target)

+  CUDA_ADD_CUDA_INCLUDE_ONCE()
+
   # Separate the sources from the options
   CUDA_GET_SOURCES_AND_OPTIONS(_sources _options ${ARGN})
   # Create custom commands and targets for each file.
@@ -984,6 +1013,8 @@
 ###############################################################################
 macro(CUDA_ADD_EXECUTABLE cuda_target)

+  CUDA_ADD_CUDA_INCLUDE_ONCE()
+
   # Separate the sources from the options
   CUDA_GET_SOURCES_AND_OPTIONS(_sources _options ${ARGN})
   # Create custom commands and targets for each file.
@@ -1077,7 +1108,12 @@
   # Call this after you add all your CUDA targets, and you will get a convience
   # target.  You should also make clean after running this target to get the
   # build system to generate all the code again.
-  add_custom_target(CleanCudaDepends
+
+  set(cuda_clean_target_name clean_cuda_depends)
+  if (CMAKE_GENERATOR MATCHES "Visual Studio")
+    string(TOUPPER ${cuda_clean_target_name} cuda_clean_target_name)
+  endif()
+  add_custom_target(${cuda_clean_target_name}
     COMMAND ${CMAKE_COMMAND} -E remove ${CUDA_ADDITIONAL_CLEAN_FILES})

   # Clear out the variable, so the next time we configure it will be empty.


r9205/sofa : work in progress: FindGLEW.cmake

Former-commit-id: 1ab6d63ea923d6f717e968b33e394c0dcf04a6de

--- cmake/FindGLEW.cmake
+++ cmake/FindGLEW.cmake
@@ -24,22 +24,26 @@

 	if(UNIX)
 		if(APPLE)
-			# on Mac, use the dependency package
+			# on Mac, GLEW is in the dependency package
 			set(GLEW_LIBRARIES "${SOFA_LIB_OS_DIR}/libglew.dylib")
 			set(GLEW_INCLUDE_DIR "${SOFA_INC_DIR}")
 		else(APPLE)
 			find_path(GLEW_INCLUDE_DIR GL/glew.h)
-			find_library(GLEW_LIBRARIES "glew")
+			find_library(GLEW_LIBRARIES NAMES glew64 GLEW glew glew32)
 		endif(APPLE)
 	endif(UNIX)
+
+

 	if(EXISTS "${GLEW_INCLUDE_DIR}/GL/glew.h" AND EXISTS ${GLEW_LIBRARIES})
 		message(STATUS "GLEW Lib found: ${GLEW_LIBRARIES} ${GLEW_INCLUDE_DIR}")
 		set(GLEW_FOUND SHARED INTERNAL TRUE)
 	else()
-		message(FATAL_ERROR "GLEW NOT FOUND")
+		message(FATAL_ERROR "GLEW NOT FOUND ${GLEW_LIBRARIES} ${GLEW_INCLUDE_DIR}")
 		set(GLUE_FOUND FALSE)
 	endif()
+
+

 endif(NOT DEFINED GLEW_FOUND)


store clang version in Vc_CLANG_VERSION

store clang version in Vc_CLANG_VERSION

--- cmake/VcMacros.cmake
+++ cmake/VcMacros.cmake
@@ -36,7 +36,9 @@
          message(STATUS "Detected Compiler: Open64")
       elseif(CMAKE_CXX_COMPILER MATCHES "clang\\+\\+$")
          set(Vc_COMPILER_IS_CLANG true)
-         message(STATUS "Detected Compiler: Clang")
+         exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE Vc_CLANG_VERSION)
+         string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" Vc_CLANG_VERSION "${Vc_CLANG_VERSION}")
+         message(STATUS "Detected Compiler: Clang ${Vc_CLANG_VERSION}")
       elseif(MSVC)
          set(Vc_COMPILER_IS_MSVC true)
          message(STATUS "Detected Compiler: MSVC")


add PACKAGE_RELEASE, so it is standard rpm name, like safe-evpp-0.7.0.3807-1.el6.x86_64.rpm

--- cmake/packages.cmake
+++ cmake/packages.cmake
@@ -24,6 +24,7 @@

 set (PACKAGE_NAME        "${CMAKE_PROJECT_NAME}")
 set (PACKAGE_VERSION     "0.7.0.${GIT_CHECKIN_COUNT}")
+set (PACKAGE_RELEASE     "1")
 set (PACKAGE_STRING      "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set (PACKAGE_TARNAME     "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set (PACKAGE_BUGREPORT   "https://github.com/Qihoo360/evpp/issues")
@@ -44,7 +45,7 @@
 set (CPACK_PACKAGE_VERSION_MINOR "${PACKAGE_VERSION_MINOR}")
 set (CPACK_PACKAGE_VERSION_PATCH "${PACKAGE_VERSION_PATCH}")
 set (CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}")
-set (CPACK_PACKAGE_FILE_NAME     "${PACKAGE_NAME}-${PACKAGE_VERSION}-${CPACK_PACKAGE_ARCHITECTURE}")
+set (CPACK_PACKAGE_FILE_NAME     "${PACKAGE_NAME}-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.${CPACK_PACKAGE_ARCHITECTURE}")
 set (CPACK_OUTPUT_FILE_PREFIX   packages)
 set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "/home/s" "/home/s/include" "/home/s/lib" "/home/s/safe" "/home/s/safe/lib" "/home/s/safe/include")


same CCRAM handling for G4 series (always aliased)

--- cmake/stm32/g4.cmake
+++ cmake/stm32/g4.cmake
@@ -8,7 +8,7 @@
      32K  32K 128K 128K 128K 128K 128K
 )
 set(STM32_G4_CCRAM_SIZES
-     10K  10K  32K  32K  32K  32K  32K
+      0K   0K   0K   0K   0K   0K   0K
 )

 stm32_util_create_family_targets(G4)


tests: properly disable shutdown test for Cygwin

--- platforms/posix/cmake/sitl_tests.cmake
+++ platforms/posix/cmake/sitl_tests.cmake
@@ -46,7 +46,6 @@
 	list(REMOVE_ITEM tests
 		hysteresis # Intermittent timing fails.
 		uorb
-		shutdown # A mystery why it fails.
 	)
 endif()

@@ -85,20 +84,23 @@
 set_tests_properties(mavlink PROPERTIES PASS_REGULAR_EXPRESSION "mavlink PASSED")
 sanitizer_fail_test_on_error(mavlink)

-# Shutdown test
-add_test(NAME shutdown
-	COMMAND ${PX4_SOURCE_DIR}/Tools/sitl_run.sh
-		$<TARGET_FILE:px4>
-		none
-		none
-		test_shutdown
-		${PX4_SOURCE_DIR}
-		${PX4_BINARY_DIR}
-	WORKING_DIRECTORY ${SITL_WORKING_DIR})
+# A mystery why this fails on Cygwin currently.
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
+	# Shutdown test
+	add_test(NAME shutdown
+		COMMAND ${PX4_SOURCE_DIR}/Tools/sitl_run.sh
+			$<TARGET_FILE:px4>
+			none
+			none
+			test_shutdown
+			${PX4_SOURCE_DIR}
+			${PX4_BINARY_DIR}
+		WORKING_DIRECTORY ${SITL_WORKING_DIR})

-#set_tests_properties(shutdown PROPERTIES FAIL_REGULAR_EXPRESSION "shutdown FAILED")
-set_tests_properties(shutdown PROPERTIES PASS_REGULAR_EXPRESSION "Shutting down")
-sanitizer_fail_test_on_error(shutdown)
+	#set_tests_properties(shutdown PROPERTIES FAIL_REGULAR_EXPRESSION "shutdown FAILED")
+	set_tests_properties(shutdown PROPERTIES PASS_REGULAR_EXPRESSION "Shutting down")
+	sanitizer_fail_test_on_error(shutdown)
+endif()

 # Dynamic module loading test
 add_test(NAME dyn