Change CMake variable name that distinguishes the core and installed
examples builds from core_build --> CORE_BUILD

svn path=/trunk/; revision=10179

--- cmake/modules/plplot.cmake
+++ cmake/modules/plplot.cmake
@@ -60,11 +60,11 @@
 include(instdirs)
 include(rpath)

-# Common CMakeList.txt files are used to build the examples in the build
+# Common CMakeLists.txt files are used to build the examples in the build
 # tree and also to build the installed examples by the new CMake-based build
 # system devoted to that purpose. Set this fundamental identification to
 # distinguish the two cases.
-set(core_build ON)
+set(CORE_BUILD ON)

 option(BUILD_TEST "Compile examples in the build tree and enable ctest" OFF)


add double quotes around cmake_command to handle spaces (#976)

* add double quotes around cmake_command to handle spaces

* quote CMAKE_COMMAND generally

* remove empty line

--- cmake/test/nosetests.cmake
+++ cmake/test/nosetests.cmake
@@ -73,7 +73,7 @@
   set(output_path ${CATKIN_TEST_RESULTS_DIR}/${PROJECT_NAME})
   # make --xunit-file argument an absolute path (https://github.com/nose-devs/nose/issues/779)
   get_filename_component(output_path "${output_path}" ABSOLUTE)
-  set(cmd "${CMAKE_COMMAND} -E make_directory ${output_path}")
+  set(cmd "\"${CMAKE_COMMAND}\" -E make_directory ${output_path}")
   if(IS_DIRECTORY ${_path_name})
     set(tests "--where=${_path_name}")
   else()


changed source list generation to match cmake use case of automatic rerun when source list change. Autogeneration is optional, but set to on by default when cmakelst is not detected in source directory.

--- WkBuild.cmake
+++ WkBuild.cmake
@@ -310,43 +310,11 @@
 	#configuration depending on build type
 	WkBuildTypeConfig()

-	#globbing source files
-	message ( STATUS "== Gathering source files for ${PROJECT_NAME}_${target_name} in ${${PROJECT_NAME}_INCLUDE_DIR}/${target_name} and ${${PROJECT_NAME}_${target_name}_SRC_DIR}..." )
-
-	FILE(GLOB_RECURSE ${PROJECT_NAME}_${target_name}_HEADERS RELATIVE "${PROJECT_SOURCE_DIR}"
-		${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.h
-		${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.hh
-		${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.hpp
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.h
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.hh
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.hpp
-	)
-	#putting them in source groups. Very useful for VS.
-	if(WIN32)
-		foreach( header ${${PROJECT_NAME}_${target_name}_HEADERS} )
-			get_filename_component(folder ${header} DIRECTORY)
-			string(REPLACE "/" "\\" folder ${folder})
-			SOURCE_GROUP("${folder}" FILES ${header})
-		endforeach(header)
-	endif(WIN32)
-
-	FILE(GLOB_RECURSE ${PROJECT_NAME}_${target_name}_SOURCES RELATIVE "${PROJECT_SOURCE_DIR}"
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.c
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.cpp
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.cc
-	)
-	#putting them in source groups. Very useful for VS.
-	if(WIN32)
-		foreach( source ${${PROJECT_NAME}_${target_name}_SOURCES} )
-			get_filename_component(folder ${source} DIRECTORY)
-			string(REPLACE "/" "\\" folder ${folder})
-			SOURCE_GROUP("${folder}" FILES ${source})
-		endforeach(source)
-	endif(WIN32)
-
-	message ( STATUS "== Headers detected in ${${PROJECT_NAME}_INCLUDE_DIR}/${target_name} and ${${PROJECT_NAME}_${target_name}_SRC_DIR} : ${${PROJECT_NAME}_${target_name}_HEADERS}" )
-	message ( STATUS "== Sources detected in ${${PROJECT_NAME}_${target_name}_SRC_DIR} : ${${PROJECT_NAME}_${target_name}_SOURCES}" )
-
+	WkGenSourceList(${target_name})
+
+	#Loading source list from subdirectory
+	add_subdirectory(${${PROJECT_NAME}_${target_name}_SRC_DIR})
+
 	# to show we are using WkCMake to build ( can be #ifdef in header )
 	add_definitions( -D WK_BUILD )

@@ -472,28 +440,11 @@
 	#configuration depending on build type
 	WkBuildTypeConfig()

-	#globbing source files
-	message ( STATUS "== Gathering source files for ${target_name} in ${${PROJECT_NAME}_INCLUDE_DIR}/${target_name} and ${${PROJECT_NAME}_INCLUDE_DIR} and ${${target_name}_SRC_DIR}..." )
-
-	FILE(GLOB_RECURSE ${PROJECT_NAME}_${target_name}_HEADERS RELATIVE "${PROJECT_SOURCE_DIR}"
-		${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.h
-		${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.hh
-		${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.hpp
-		${${PROJECT_NAME}_INCLUDE_DIR}/*.h
-		${${PROJECT_NAME}_INCLUDE_DIR}/*.hh
-		${${PROJECT_NAME}_INCLUDE_DIR}/*.hpp
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.h
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.hh
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.hpp
-	)
-	FILE(GLOB_RECURSE ${PROJECT_NAME}_${target_name}_SOURCES RELATIVE "${PROJECT_SOURCE_DIR}"
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.c
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.cpp
-		${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.cc
-	)
-	message ( STATUS "== Headers detected in ${${PROJECT_NAME}_INCLUDE_DIR}/${target_name} and ${${PROJECT_NAME}_${target_name}_SRC_DIR} : ${${PROJECT_NAME}_${target_name}_HEADERS}" )
-	message ( STATUS "== Sources detected in ${${PROJECT_NAME}_${target_name}_SRC_DIR} : ${${PROJECT_NAME}_${target_name}_SOURCES}" )
-
+	WkGenSourceList(${target_name})
+
+	#Loading source list from subdirectory
+	add_subdirectory(${${PROJECT_NAME}_${target_name}_SRC_DIR})
+
 	# to show we are using WkCMake to build ( can be #ifdef in header )
 	add_definitions( -D WK_BUILD )

@@ -564,6 +515,68 @@

 CMAKE_POLICY(POP)
 endmacro(WkExecutableBuild)
+
+# Generate source list cmakelists.txt file for target_name
+# ${PROJECT_NAME}_${target_name}_SRC_DIR needs to hod the source directory where the cmakelists.txt will be created
+macro (WkGenSourceList target_name)
+
+	if ( EXISTS ${${PROJECT_NAME}_${target_name}_SRC_DIR}/CMakeLists.txt)
+		#If there already is a cmake lists there, we dont need to generate source list
+		option(${PROJECT_NAME}_${target_name}_GENERATE_SOURCELIST "Wether or not you want wkcmake to generate the source list for ${PROJECT_NAME}_${target_name}" OFF)
+	else() # if there is no cmakelists, the default is ON. but cache value will always prevail.
+		option(${PROJECT_NAME}_${target_name}_GENERATE_SOURCELIST "Wether or not you want wkcmake to generate the source list for ${PROJECT_NAME}_${target_name}" ON)
+	endif()
+
+	IF(${PROJECT_NAME}_${target_name}_GENERATE_SOURCELIST)
+		#globbing source files
+		message ( STATUS "== Gathering source files for ${PROJECT_NAME}_${target_name} in ${${PROJECT_NAME}_INCLUDE_DIR}/${target_name} and ${${PROJECT_NAME}_${target_name}_SRC_DIR}..." )
+
+		FILE(GLOB_RECURSE ${PROJECT_NAME}_${target_name}_HEADERS RELATIVE "${PROJECT_SOURCE_DIR}"
+			${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.h
+			${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.hh
+			${${PROJECT_NAME}_INCLUDE_DIR}/${target_name}/*.hpp
+			${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.h
+			${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.hh
+			${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.hpp
+		)
+		#putting them in source groups. Very useful for VS.
+		if(WIN32)
+			foreach( header ${${PROJECT_NAME}_${target_name}_HEADERS} )
+				get_filename_component(folder ${header} DIRECTORY)
+				string(REPLACE "/" "\\" folder ${folder})
+				SOURCE_GROUP("${folder}" FILES ${header})
+			endforeach(header)
+		endif(WIN32)
+
+		FILE(GLOB_RECURSE ${PROJECT_NAME}_${target_name}_SOURCES RELATIVE "${PROJECT_SOURCE_DIR}"
+			${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.c
+			${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.cpp
+			${${PROJECT_NAME}_${target_name}_SRC_DIR}/*.cc
+		)
+		#putting them in source groups. Very useful for VS.
+		if(WIN32)
+			foreach( source ${${PROJECT_NAME}_${target_name}_SOURCES} )
+				get_filename_component(folder ${source} DIRECTORY)
+				string(REPLACE "/" "\\" folder ${folder})
+				SOURCE_GROUP("${folder}" FILES ${source})
+			endforeach(source)
+		endif(WIN32)
+
+		message ( STATUS "== Headers detected in ${${PROJECT_NAME}_INCLUDE_DIR}/${target_name} and ${${PROJECT_NAME}_${target_name}_SRC_DIR} : ${${PROJECT_NAME}_${target_name}_HEADERS}" )
+		message ( STATUS "== Sources detected in ${${PROJECT_NAME}_${target_name}_SRC_DIR} : ${${PROJECT_NAME}_${target_name}_SOURCES}" )
+
+			#Generating config file
+		file( WRITE ${${PROJECT_NAME}_${target_name}_SRC_DIR}/CMakeLists.txt
+"### Sourcelist file for ${PROJECT_NAME}_${target_name} auto generated by WkCmake ###
+
+SET(${PROJECT_NAME}_${target_name}_HEADERS ${${PROJECT_NAME}_${target_name}_HEADERS} PARENT_SCOPE)
+SET(${PROJECT_NAME}_${target_name}_SOURCES ${${PROJECT_NAME}_${target_name}_SOURCES} PARENT_SCOPE)
+"		)
+
+	ENDIF(${PROJECT_NAME}_${target_name}_GENERATE_SOURCELIST)
+
+
+endmacro (WkGenSourceList)

 macro (WkBuildTypeConfig)


BUG: reset variables only if they had a value

--- Common.cmake
+++ Common.cmake
@@ -88,10 +88,14 @@
     ${ARGN}
     )
   foreach( var ${TMP_NAMES} )
-    set( ${var} ${${var}_TMP} CACHE PATH "${var} PATH" FORCE )
-    unset( ${var}_TMP )
-    if( TMP_VERBOSE )
-      message( "resetting ${var} - new value: "${${var}} )
+    if( "${${var}_TMP}" STREQUAL "" )
+      message( "Does not reset ${var}. ${var}_TMP was empty" )
+    else()
+      set( ${var} ${${var}_TMP} CACHE PATH "${var} PATH" FORCE )
+      unset( ${var}_TMP )
+      if( TMP_VERBOSE )
+        message( "resetting ${var} - new value: "${${var}} )
+      endif()
     endif()
   endforeach()
 endmacro()


[cmake] do not fail if we don't find LpSolve

--- Numerics/cmake/FindLpSolve.cmake
+++ Numerics/cmake/FindLpSolve.cmake
@@ -11,7 +11,7 @@
   GET_FILENAME_COMPONENT(LpSolve_LIBRARY_DIRS_DIR ${LpSolve_LIBRARY_DIRS} PATH)
   SET(LpSolve_FOUND 1)
 ELSE(LpSolve_LIBRARY)
-  MESSAGE(FATAL_ERROR "Cannot find LPSOLVE libraries!")
+  MESSAGE("Cannot find LPSOLVE libraries!")
 ENDIF (LpSolve_LIBRARY)
 IF (NOT LpSolve_FIND_QUIETLY)
   MESSAGE(STATUS "Found LpSolve: ${LpSolve_LIBRARY}")


Backed out changeset 211aeed4e8f4 backing out "Switching to 10.5 SDK"

--- indra/cmake/Variables.cmake
+++ indra/cmake/Variables.cmake
@@ -79,7 +79,7 @@
   # NOTE: wont have a distributable build unless you add this on the configure line with:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
   #set(CMAKE_OSX_ARCHITECTURES i386;ppc)
-  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
   if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
     set(ARCH universal)
   else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")


LLVMProcessSources: add .def files along with .h files to targets for
the benefit of project-based generators (VS, XCode, etc).

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@122749 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLVMProcessSources.cmake
+++ cmake/modules/LLVMProcessSources.cmake
@@ -12,7 +12,7 @@

 macro(add_header_files srcs)
-  file(GLOB hds *.h)
+  file(GLOB hds *.h *.def)
   if( hds )
     set_source_files_properties(${hds} PROPERTIES HEADER_FILE_ONLY ON)
     list(APPEND ${srcs} ${hds})


[Config] (hopefully) better detection of Boost.Python across platforms

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -504,7 +504,7 @@
 	  set (PY_MINOR_VERSION "${CMAKE_MATCH_2}")
 	  set (PY_PATCH_VERSION "${CMAKE_MATCH_3}")
 	endif (${PYTHONLIBS_VERSION_STRING} MATCHES "([0-9]).([0-9]).([0-9])")
-
+
 	message (STATUS "Found PythonLibs ${PYTHONLIBS_VERSION} (${PYTHONLIBS_VERSION_STRING} / ${PY_MAJOR_VERSION}.${PY_MINOR_VERSION}.${PY_PATCH_VERSION})")

 	# Set the Python installation directory
@@ -585,15 +585,15 @@
 macro (register_boost_lib _boost_lib_list_name _boost_lib_list)
   # Update the list of library dependencies for the project
   foreach (_lib_cpt ${_boost_lib_list})
-	string (TOUPPER ${_lib_cpt} _lib_cpt_up)
-
-	if (Boost_${_lib_cpt_up}_LIBRARY)
-	  # Update the list of dependencies for the project
-	  list (APPEND ${_boost_lib_list_name} ${Boost_${_lib_cpt_up}_LIBRARY})
-
-	  # Update the list of libraries to be displayed
-	  list (APPEND BOOST_REQUIRED_LIBS ${Boost_${_lib_cpt_up}_LIBRARY})
-	endif (Boost_${_lib_cpt_up}_LIBRARY)
+    string (TOUPPER ${_lib_cpt} _lib_cpt_up)
+
+    if (Boost_${_lib_cpt_up}_LIBRARY)
+      # Update the list of dependencies for the project
+      list (APPEND ${_boost_lib_list_name} ${Boost_${_lib_cpt_up}_LIBRARY})
+
+      # Update the list of libraries to be displayed
+      list (APPEND BOOST_REQUIRED_LIBS ${Boost_${_lib_cpt_up}_LIBRARY})
+    endif (Boost_${_lib_cpt_up}_LIBRARY)
   endforeach (_lib_cpt ${_boost_lib_list})
 endmacro (register_boost_lib _boost_lib_list_name _boost_lib_list)

@@ -606,18 +606,26 @@
   else (${ARGC} GREATER 0)
     message (STATUS "Requires Boost without specifying any version")
   endif (${ARGC} GREATER 0)
-
+
   #
-  # Note: ${Boost_DATE_TIME_LIBRARY} and ${Boost_PROGRAM_OPTIONS_LIBRARY}
-  # are already set by ${SOCIMYSQL_LIBRARIES} and/or ${SOCI_LIBRARIES}.
-  #
-  set (python_component_name "python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}")
+  # Note 1: ${Boost_DATE_TIME_LIBRARY} and ${Boost_PROGRAM_OPTIONS_LIBRARY}
+  #         are already set by ${SOCIMYSQL_LIBRARIES} and/or ${SOCI_LIBRARIES}.
+  # Note 2: Boost libraries are not installed in a consistent way across the
+  #         the different platforms and versions of Boost.
+  #         For a while, the Boost.Python library component was just called
+  #         'python'. It is now suffixed with the version of Python, and
+  #         on some Linux distributions, there is even a '-py' suffix.
+  #         On some platform/Boost version combinations, the Python version
+  #         may be just the major version (2 or 3 as of 2019) or the major
+  #         and minor versions (e.g., 27, 28, 34, 36, 37 as of 2019)
+  set (python_cpt_name1 "python${PY_MAJOR_VERSION}")
+  set (python_cpt_name2 "python${PY_MAJOR_VERSION}${PY_MINOR_VERSION}")
   set (Boost_USE_STATIC_LIBS OFF)
   set (Boost_USE_MULTITHREADED ON)
   set (Boost_USE_STATIC_RUNTIME OFF)
   set (BOOST_REQUIRED_COMPONENTS_FOR_LIB
     date_time random iostreams serialization filesystem system
-	locale ${python_component_name} regex)
+    locale ${python_cpt_name1} ${python_cpt_name2} regex)
   set (BOOST_REQUIRED_COMPONENTS_FOR_BIN program_options)
   set (BOOST_REQUIRED_COMPONENTS_FOR_TST unit_test_framework)
   set (BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS_FOR_LIB}
@@ -637,23 +645,28 @@
   find_package (BoostWrapper ${_required_version} REQUIRED)

   if (Boost_FOUND)
+    # Boost.Python library
+    message (STATUS "  + Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
+    message (STATUS "  + Boost_PYTHON3_LIBRARY: ${Boost_PYTHON3_LIBRARY}")
+    message (STATUS "  + Boost_PYTHON37_LIBRARY: ${Boost_PYTHON37_LIBRARY}")
+
     # Update the list of include directories for the project
     include_directories (${Boost_INCLUDE_DIRS})

-	# For display purposes
+    # For display purposes
     set (BOOST_REQUIRED_LIBS "")

     # Update the list of library dependencies for the project
-	register_boost_lib ("PROJ_DEP_LIBS_FOR_LIB"
-	  "${BOOST_REQUIRED_COMPONENTS_FOR_LIB}")
+    register_boost_lib ("PROJ_DEP_LIBS_FOR_LIB"
+      "${BOOST_REQUIRED_COMPONENTS_FOR_LIB}")

     # Update the list of binary dependencies for the project
-	register_boost_lib ("PROJ_DEP_LIBS_FOR_BIN"
-	  "${BOOST_REQUIRED_COMPONENTS_FOR_BIN}")
+    register_boost_lib ("PROJ_DEP_LIBS_FOR_BIN"
+      "${BOOST_REQUIRED_COMPONENTS_FOR_BIN}")

     # Update the list of test dependencies for the project
-	register_boost_lib ("PROJ_DEP_LIBS_FOR_TST"
-	  "${BOOST_REQUIRED_COMPONENTS_FOR_TST}")
+    register_boost_lib ("PROJ_DEP_LIBS_FOR_TST"
+      "${BOOST_REQUIRED_COMPONENTS_FOR_TST}")

   endif (Boost_FOUND)


[Build] Added the macro for Readline dependency.

--- config/project_config_embeddable.cmake
+++ config/project_config_embeddable.cmake
@@ -252,6 +252,10 @@
       get_boost (${_arg_version})
     endif (${_arg_lower} STREQUAL "boost")

+    if (${_arg_lower} STREQUAL "readline")
+      get_readline (${_arg_version})
+    endif (${_arg_lower} STREQUAL "readline")
+
     if (${_arg_lower} STREQUAL "mysql")
       get_mysql (${_arg_version})
     endif (${_arg_lower} STREQUAL "mysql")
@@ -333,6 +337,33 @@
   endif (Boost_FOUND)

 endmacro (get_boost)
+
+# ~~~~~~~~~~ Readline ~~~~~~~~~
+macro (get_readline)
+  set (_required_version 0)
+  if (${ARGC} GREATER 0)
+    set (_required_version ${ARGV0})
+    message (STATUS "Requires Readline-${_required_version}")
+  else (${ARGC} GREATER 0)
+    message (STATUS "Requires Readline without specifying any version")
+  endif (${ARGC} GREATER 0)
+
+  set (READLINE_FOUND False)
+
+  find_package (Readline)
+  if (READLINE_LIBRARY)
+    set (READLINE_FOUND True)
+  endif (READLINE_LIBRARY)
+
+  if (READLINE_FOUND)
+    # Update the list of include directories for the project
+    include_directories (${READLINE_INCLUDE_DIR})
+
+    # Update the list of dependencies for the project
+    set (PROJ_DEP_LIBS_FOR_LIB ${PROJ_DEP_LIBS_FOR_LIB} ${READLINE_LIBRARY})
+  endif (READLINE_FOUND)
+
+endmacro (get_readline)

 # ~~~~~~~~~~ MySQL ~~~~~~~~~
 macro (get_mysql)
@@ -829,7 +860,7 @@

   # Register the (CMake) target for the executable, and specify the name
   # of that latter
-  add_executable (${_exec_name}bin ${_exec_source_dir}/${MODULE_NAME}.cpp)
+  add_executable (${_exec_name}bin ${_exec_source_dir}/${_exec_name}.cpp)
   set_target_properties (${_exec_name}bin PROPERTIES OUTPUT_NAME ${_exec_name})

   # Register the dependencies on which the binary depends upon
@@ -848,7 +879,7 @@

   # Register, for reporting purpose, the list of executables to be built
   # and installed for that module
-  list (APPEND ${MODULE_NAME}_ALL_EXECS ${PROJ_ALL_BIN_TARGETS})
+  list (APPEND ${MODULE_NAME}_ALL_EXECS ${_exec_name})
   set (${MODULE_NAME}_ALL_EXECS ${${MODULE_NAME}_ALL_EXECS} PARENT_SCOPE)

 endmacro (module_binary_add)
@@ -1026,6 +1057,17 @@
     message (STATUS "  - Boost required libraries ... : ${BOOST_REQUIRED_LIBS}")
   endif (Boost_FOUND)
 endmacro (display_boost)
+
+# Readline
+macro (display_readline)
+  if (READLINE_FOUND)
+    message (STATUS)
+    message (STATUS "* Readline:")
+    message (STATUS "  - READLINE_VERSION ........... : ${READLINE_VERSION}")
+    message (STATUS "  - READLINE_INCLUDE_DIR ....... : ${READLINE_INCLUDE_DIR}")
+    message (STATUS "  - READLINE_LIBRARY ........... : ${READLINE_LIBRARY}")
+  endif (READLINE_FOUND)
+endmacro (display_readline)

 # MySQL
 macro (display_mysql)
@@ -1136,6 +1178,7 @@
   message (STATUS "---------------------------------")
   #
   display_boost ()
+  display_readline ()
   display_mysql ()
   display_soci ()
   display_stdair ()


chore(cmake): remove unused module

chore(cmake): remove unused module

--- cmake/Modules/FindCrypto++.cmake
+++ cmake/Modules/FindCrypto++.cmake
@@ -1,32 +0,0 @@
-# - Find Crypto++
-
-if (CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-    set (CRYPTO++_FOUND TRUE)
-else (CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-    find_path (CRYPTO++_INCLUDE_DIR cryptlib.h
-        /usr/include/crypto++
-        /usr/include/cryptopp
-        /usr/local/include/crypto++
-        /usr/local/include/cryptopp
-        /opt/local/include/crypto++
-        /opt/local/include/cryptopp
-        $ENV{SystemDrive}/Crypto++/include
-    )
-
-    find_library (CRYPTO++_LIBRARIES NAMES cryptopp libcryptopp
-        PATHS
-        /usr/lib
-        /usr/local/lib
-        /opt/local/lib
-        $ENV{SystemDrive}/Crypto++/lib
-    )
-
-    if (CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-        set (CRYPTO++_FOUND TRUE)
-        message (STATUS "Found Crypto++: ${CRYPTO++_INCLUDE_DIR}, ${CRYPTO++_LIBRARIES}")
-    else (CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-        set (CRYPTO++_FOUND FALSE)
-        message (STATUS "Crypto++ not found.")
-    endif (CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-  mark_as_advanced (CRYPTO++_INCLUDE_DIR CRYPTO++_LIBRARIES)
-endif (CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)


Fix ${PROJECT_NAME}_CONFIG_EXTRAS_POST (#140)

* Fix #139.

* project specific variable after the global populated by functions

--- ament_cmake_core/cmake/core/ament_package.cmake
+++ ament_cmake_core/cmake/core/ament_package.cmake
@@ -86,6 +86,7 @@
     ${PACKAGE_CONFIG_EXTRAS}
     ${${PROJECT_NAME}_CONFIG_EXTRAS}
     ${PACKAGE_CONFIG_EXTRAS_POST}
+    ${${PROJECT_NAME}_CONFIG_EXTRAS_POST}
   )
     assert_file_exists("${extra}"
       "ament_package() called with extra file '${extra}' which does not exist")


Set CMAKE_INCLUDE_SYSTEM_FLAG so that added system paths get correct prefix

Sadly can not be used for codewarrior built in environment variables

--- toolchain/Platform/Generic-chc12.cmake
+++ toolchain/Platform/Generic-chc12.cmake
@@ -106,6 +106,9 @@
 #
 # Compiler invocation.
 #
+SET (CMAKE_INCLUDE_SYSTEM_FLAG_C         "-EnvLIBPATH=")
+SET (CMAKE_INCLUDE_SYSTEM_FLAG_CXX       "-EnvLIBPATH=")
+
 SET (CMAKE_C_COMPILE_OBJECT              "<CMAKE_C_COMPILER>   ${CHC12_STANDARD_FLAGS} <DEFINES> <FLAGS> -ObjN=<OBJECT> -Lasm=<OBJECT>.lst <SOURCE>")
 SET (CMAKE_CXX_COMPILE_OBJECT            "<CMAKE_CXX_COMPILER> ${CHC12_STANDARD_FLAGS} <DEFINES> <FLAGS> -ObjN=<OBJECT> -Lasm=<OBJECT>.lst <SOURCE>")


[FEATURE] install FindSeqAn.cmake for library target

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -201,8 +201,10 @@
                  DESTINATION share/doc/seqan)
         # Install pkg-config file, except on Windows.
         if (NOT CMAKE_SYSTEM_NAME MATCHES Windows)
-            configure_file("util/pkgconfig/seqan.pc.in" "${CMAKE_BINARY_DIR}/util/pkgconfig/seqan-${SEQAN_MAJOR_VERSION}.pc" @ONLY)
-            install(FILES "${CMAKE_BINARY_DIR}/util/pkgconfig/seqan-${SEQAN_MAJOR_VERSION}.pc" DESTINATION share/pkgconfig)
+            configure_file("util/pkgconfig/seqan.pc.in" "${CMAKE_BINARY_DIR}/util/pkgconfig/seqan-${SEQAN_VERSION_MAJOR}.pc" @ONLY)
+            install(FILES "${CMAKE_BINARY_DIR}/util/pkgconfig/seqan-${SEQAN_VERSION_MAJOR}.pc" DESTINATION share/pkgconfig)
+            # Install FindSeqAn TODO(h-2) rename FindSeqAn.cmake to FindSeqAn${SEQAN_VERSION_MAJOR}.cmake after 2.x cycle
+            install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/util/cmake/FindSeqAn.cmake" DESTINATION share/cmake/Modules)
         endif (NOT CMAKE_SYSTEM_NAME MATCHES Windows)
     endif ()


[INTERNAL] Not including seqan.h any more in SeqAnBuildSystem.cmake.

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

--- util/cmake/SeqAnBuildSystem.cmake
+++ util/cmake/SeqAnBuildSystem.cmake
@@ -227,8 +227,7 @@
         file (GLOB HEADERS
               RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
               include/seqan/[A-z]*/[A-z]*.h
-              include/seqan/[A-z]*.h
-              include/seqan.h)
+              include/seqan/[A-z]*.h)
         foreach (HEADER ${HEADERS})
             get_filename_component (_DESTINATION ${HEADER} PATH)
             install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${HEADER} DESTINATION ${_DESTINATION})
@@ -236,8 +235,7 @@
     endif ()

     # Get list of header and super header files.
-    file (GLOB SUPER_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/seqan/[A-z]*.h
-                             ${CMAKE_CURRENT_SOURCE_DIR}/include/seqan.h)
+    file (GLOB SUPER_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/seqan/[A-z]*.h)
     file (GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/seqan/[A-z]*/[A-z]*.h)

     # Sort headers for Xcode, ...


[cmake alembic] Iex is optional

[cmake alembic] Iex is optional

No Iex library in old versions of IlmBase.

--- src/cmakeFindModules/FindAlembic.cmake
+++ src/cmakeFindModules/FindAlembic.cmake
@@ -22,22 +22,31 @@
 # Alembic includes half.h for a single function "half to float", this is unfortunate
 FIND_PATH(ABC_HALF_INCLUDE_DIR half.h
     HINTS
-    ${ALEMBIC_ILMBASE_ROOT}/include/OpenEXR
-    $ENV{ALEMBIC_ILMBASE_ROOT}/include/OpenEXR
-    $ENV{ILMBASE_INCLUDE_DIR} )
+        ${ALEMBIC_ILMBASE_ROOT}/include
+        $ENV{ALEMBIC_ILMBASE_ROOT}/include
+        $ENV{ILMBASE_INCLUDE_DIR}
+    PATH_SUFFIXES
+        OpenEXR
+    )

-FIND_PATH(ABC_ILMBASE_LIBS_PATH NAMES libIex.so libIex.a
+FIND_LIBRARY(ABC_ILMBASE_IEX_LIB NAMES Iex
     PATHS
-        ${ALEMBIC_ILMBASE_ROOT}/lib
+        ${ALEMBIC_ILMBASE_ROOT}/lib
         ${ALEMBIC_ILMBASE_ROOT}/lib/static
         ${ALEMBIC_ILMBASE_ROOT}/lib64
-        $ENV{ALEMBIC_ILMBASE_ROOT}/lib
+        $ENV{ALEMBIC_ILMBASE_ROOT}/lib
         $ENV{ALEMBIC_ILMBASE_ROOT}/lib64
         $ENV{ILMBASE_LIBRARY_DIR}
     )

+GET_FILENAME_COMPONENT(${ABC_ILMBASE_IEX_LIB} ABC_ILMBASE_LIBS_PATH DIRECTORY)
+
 FIND_LIBRARY(ABC_ILMBASE_IEX Iex PATHS ${ABC_ILMBASE_LIBS_PATH})
 FIND_LIBRARY(ABC_ILMBASE_IEXMATH IexMath PATHS ${ABC_ILMBASE_LIBS_PATH})
+IF(ABC_ILMBASE_IEXMATH MATCHES ".*-NOTFOUND")
+  # This library is optional, so ignore if not found.
+  SET(ABC_ILMBASE_IEXMATH "")
+ENDIF()
 FIND_LIBRARY(ABC_ILMBASE_HALF Half PATHS ${ABC_ILMBASE_LIBS_PATH})
 SET(ABC_ILMBASE_LIBS ${ABC_ILMBASE_IEX} ${ABC_ILMBASE_IEXMATH} ${ABC_ILMBASE_HALF})

@@ -77,9 +86,13 @@
         $ENV{ALEMBIC_ROOT}/include
         $ENV{ALEMBIC_INCLUDE_DIR}
         ${ALEMBIC_ROOT}/include
+        ${ALEMBIC_INCLUDE_DIR}
     PATH_SUFFIXES
         alembic
     )
+
+# message(STATUS "ALEMBIC_ROOT: ${ALEMBIC_ROOT}")
+# message(STATUS "ABC_INCLUDE_DIR: ${ABC_INCLUDE_DIR}")
 # message(STATUS "ABC_OPENEXR_LIBS ${ABC_OPENEXR_LIBS}")

 #


Fixed status message

Fixed status message

Former-commit-id: ee4094704ec68847734568fefd8b18229c5ea8c7

--- cmake-modules/Fetch_ceres-solver.cmake
+++ cmake-modules/Fetch_ceres-solver.cmake
@@ -59,7 +59,6 @@

 if(TARGET ceres::ceres OR TARGET ceres)
-    message(STATUS "ceres found")
 elseif(NOT ${DMRG_DOWNLOAD_METHOD} MATCHES "none")
     message(STATUS "Ceres will be installed into ${CMAKE_INSTALL_PREFIX} on first build.")
     get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)


Fix recently introduced CFLAGS processing logic for case when CFLAGS is not defined as an
environment variable or is empty.

svn path=/trunk/; revision=12614

--- cmake/build_projects/shapelib/bp.cmake
+++ cmake/build_projects/shapelib/bp.cmake
@@ -49,7 +49,7 @@

 set(${BP_PACKAGE}_CFLAGS $ENV{CFLAGS})
 # Eliminate this option which is not allowed for shapelib
-string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_CFLAGS ${${BP_PACKAGE}_CFLAGS})
+string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_CFLAGS "${${BP_PACKAGE}_CFLAGS}")

 ExternalProject_Add(
   build_${BP_PACKAGE}


Move check for C++11 inside if case to not affect non-cuda configuration

--- cmake/configure/configure_1_cuda.cmake
+++ cmake/configure/configure_1_cuda.cmake
@@ -19,15 +19,17 @@

 MACRO(FEATURE_CUDA_FIND_EXTERNAL var)

-  IF(NOT DEAL_II_WITH_CXX11)
-    MESSAGE(FATAL_ERROR "\n"
-      "CUDA only supported with C++11. Reconfigure with DEAL_II_WITH_CXX11=ON.\n"
-      )
-  ENDIF()

   FIND_PACKAGE(CUDA)

   IF(CUDA_FOUND)
+
+    IF(NOT DEAL_II_WITH_CXX11)
+      MESSAGE(FATAL_ERROR "\n"
+        "CUDA only supported with C++11. Reconfigure with DEAL_II_WITH_CXX11=ON.\n"
+        )
+    ENDIF()
+
     SET(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE FALSE)

     # Activate C++11 since we require it above.


Update CheckCXXLinkerFlag

Update CheckCXXLinkerFlag

--- cmake/modules/CheckCXXLinkerFlag.cmake
+++ cmake/modules/CheckCXXLinkerFlag.cmake
@@ -79,15 +79,15 @@
     endif()
   else()
     _check_cxx_linker_flag(-Wl,--fatal-warnings
-      HRVO_LINKER_SUPPORTS__FATAL_WARNINGS)
+      CHECK_CXX_LINKER_FLAG_LINKER_SUPPORTS__FATAL_WARNINGS)

-    if(HRVO_LINKER_SUPPORTS__FATAL_WARNINGS)
+    if(CHECK_CXX_LINKER_FLAG_LINKER_SUPPORTS__FATAL_WARNINGS)
       set(_FATAL_WARNINGS_FLAG -Wl,--fatal-warnings)
     else()
       _check_cxx_linker_flag(-Wl,-fatal_warnings
-        HRVO_LINKER_SUPPORTS_FATAL_WARNINGS)
+        CHECK_CXX_LINKER_FLAG_LINKER_SUPPORTS_FATAL_WARNINGS)

-      if(HRVO_LINKER_SUPPORTS_FATAL_WARNINGS)
+      if(CHECK_CXX_LINKER_FLAG_LINKER_SUPPORTS_FATAL_WARNINGS)
         set(_FATAL_WARNINGS_FLAG -Wl,-fatal_warnings)
       else()
         set(_FATAL_WARNINGS_FLAG)


Made llvm_replace_compiler_option more robust. Use it on
llvm_process_sources.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@123232 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLVMProcessSources.cmake
+++ cmake/modules/LLVMProcessSources.cmake
@@ -1,15 +1,22 @@
 include(AddFileDependencies)

-macro(llvm_replace_compiler_option var old new)
+function(llvm_replace_compiler_option var old new)
   # Replaces a compiler option or switch `old' in `var' by `new'.
   # If `old' is not in `var', appends `new' to `var'.
   # Example: llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2")
+  # If the option already is on the variable, don't add it:
+  if( "${${var}}" MATCHES "(^| )${new}($| )" )
+    set(n "")
+  else()
+    set(n "${new}")
+  endif()
   if( "${${var}}" MATCHES "(^| )${old}($| )" )
-    string( REGEX REPLACE "(^| )${old}($| )" " ${new}  " ${var} "${${var}}" )
+    string( REGEX REPLACE "(^| )${old}($| )" " ${n} " ${var} "${${var}}" )
   else()
-    set( ${var} "${${var}} ${new}" )
+    set( ${var} "${${var}} ${n}" )
   endif()
-endmacro(llvm_replace_compiler_option)
+  set( ${var} "${${var}}" PARENT_SCOPE )
+endfunction(llvm_replace_compiler_option)

 macro(add_td_sources srcs)
   file(GLOB tds *.td)
@@ -52,15 +59,15 @@
     if( CMAKE_COMPILER_IS_GNUCXX )
       add_definitions( -fno-exceptions )
     elseif( MSVC )
-      string( REGEX REPLACE "[ ^]/EHsc ?" " /EHs-c- " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
+      llvm_replace_compiler_option(CMAKE_CXX_FLAGS "/EHsc" "/EHs-c-")
       add_definitions( /D_HAS_EXCEPTIONS=0 )
     endif()
   endif()
   if( NOT LLVM_REQUIRES_RTTI )
     if( CMAKE_COMPILER_IS_GNUCXX )
-      add_definitions( -fno-rtti )
+      llvm_replace_compiler_option(CMAKE_CXX_FLAGS "-frtti" "-fno-rtti")
     elseif( MSVC )
-      string( REGEX REPLACE "[ ^]/GR ?" " /GR- " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
+      llvm_replace_compiler_option(CMAKE_CXX_FLAGS "/GR" "/GR-")
     endif()
   endif()


[CMake] Let llvm_process_sources check not only *.cpp but also *.c.

git-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@200298 91177308-0d34-0410-b5e6-96231b3b80d8

--- cmake/modules/LLVMProcessSources.cmake
+++ cmake/modules/LLVMProcessSources.cmake
@@ -82,7 +82,7 @@

 function(llvm_check_source_file_list)
   set(listed ${ARGN})
-  file(GLOB globbed *.cpp)
+  file(GLOB globbed *.c *.cpp)
   foreach(g ${globbed})
     get_filename_component(fn ${g} NAME)
     list(FIND LLVM_OPTIONAL_SOURCES ${fn} idx)
@@ -90,7 +90,7 @@
       list(FIND listed ${fn} idx)
       if( idx LESS 0 )
         message(SEND_ERROR "Found unknown source file ${g}
-Please update ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\n")
+Please update ${CMAKE_CURRENT_LIST_FILE}\n")
       endif()
     endif()
   endforeach()


Bumped hardcoded version

Bumped hardcoded version

--- cmake/DetermineTomvizVersion.cmake
+++ cmake/DetermineTomvizVersion.cmake
@@ -7,7 +7,7 @@
 #   tomviz_version
 #   tomviz_version_long

-set(hardcoded_tomviz_version "0.7.0")
+set(hardcoded_tomviz_version "0.7.1")

 function(_set_version_vars versiontext)
   string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)[-]*(.*)" version_matches "${versiontext}")


Fix typo of C compiler name in armv7 script.

--- cmake/tool_chain/armv7_cross.cmake
+++ cmake/tool_chain/armv7_cross.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armv7)

-set(CMAKE_C_COMPILER arm-linux-gnueabihf-g++-8)
+set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc-8)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++-8)

 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)


 - плагины в свою папку
 - отключено копирование D3DCompiler_43.dll
 - форматирование

git-svn-id: 41bd7e47c31e4d43f97241d7529f6785d233c6d8@12536 23f926e6-80f1-49ca-85a0-60d4a27bb3ac

--- rdo/packages/cmake/trunk/win32.install.cmake
+++ rdo/packages/cmake/trunk/win32.install.cmake
@@ -6,78 +6,85 @@
 	SET(CONFIG_DIRECTORY_RELEASE ${EXECUTABLE_OUTPUT_PATH})
 ENDIF()

-SET(QT_LIBRARY_DIR       $ENV{QTDIR}/bin              )
-SET(QT_PLATFORM_DIR      $ENV{QTDIR}/plugins/platforms)
+SET(QT_PLUGINS            plugins)
+SET(QT_PLUGINS_PLATFORMS  ${QT_PLUGINS}/platforms)
+SET(QT_PLUGINS_SQLDRIVERS ${QT_PLUGINS}/sqldrivers)
+
+SET(QT_LIBRARY_DIR             $ENV{QTDIR}/bin                     )
+SET(QT_PLUGINS_PLATFORMS_DIR   $ENV{QTDIR}/${QT_PLUGINS_PLATFORMS} )
+SET(QT_PLUGINS_SQLDRIVERS_DIR  $ENV{QTDIR}/${QT_PLUGINS_SQLDRIVERS})

 FIND_FILE(DLL_ICUUC       icuuc51.dll        PATHS ${QT_LIBRARY_DIR})
 FIND_FILE(DLL_ICUIN       icuin51.dll        PATHS ${QT_LIBRARY_DIR})
 FIND_FILE(DLL_ICUDT       icudt51.dll        PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_D3DCOMPILER D3DCompiler_43.dll PATHS ${QT_LIBRARY_DIR})
-
-FIND_FILE(DLL_D_QT_CORE    Qt5Cored.dll    PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_D_QT_CUI     Qt5Guid.dll     PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_D_QT_WIDGETS Qt5Widgetsd.dll PATHS ${QT_LIBRARY_DIR})
-
-FIND_FILE(DLL_GLES libEGL.dll    PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_EGL  libGLESv2.dll PATHS ${QT_LIBRARY_DIR})
-
-FIND_FILE(DLL_D_QWINDOWS qwindowsd.dll PATHS ${QT_PLATFORM_DIR})
-FIND_FILE(DLL_D_QMINIMAL qminimald.dll PATHS ${QT_PLATFORM_DIR})
-
-IF (MSVC90)
-	FIND_FILE(DLL_D_MSVCR msvcp90d.dll)
-	FIND_FILE(DLL_D_MSVCP msvcr90d.dll)
-	FIND_FILE(DLL_R_MSVCR msvcp90.dll)
-	FIND_FILE(DLL_R_MSVCP msvcr90.dll)
-ELSE()
-	FIND_FILE(DLL_D_MSVCP msvcp100d.dll)
-	FIND_FILE(DLL_D_MSVCR msvcr100d.dll)
-	FIND_FILE(DLL_R_MSVCP msvcp100.dll)
-	FIND_FILE(DLL_R_MSVCR msvcr100.dll)
-ENDIF()
-
-FIND_FILE(DLL_R_QT_CORE    Qt5Core.dll    PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_R_QT_CUI     Qt5Gui.dll     PATHS ${QT_LIBRARY_DIR})
-FIND_FILE(DLL_R_QT_WIDGETS Qt5Widgets.dll PATHS ${QT_LIBRARY_DIR})
-
-FIND_FILE(DLL_R_QWINDOWS qwindows.dll PATHS ${QT_PLATFORM_DIR})
-FIND_FILE(DLL_R_QMINIMAL qminimal.dll PATHS ${QT_PLATFORM_DIR})
-
+#FIND_FILE(DLL_D3DCOMPILER D3DCompiler_43.dll PATHS ${QT_LIBRARY_DIR})
 SET(DLL_D_AND_R
 	${DLL_ICUUC}
 	${DLL_ICUIN}
 	${DLL_ICUDT}
-	${DLL_D3DCOMPILER}
+#	${DLL_D3DCOMPILER}
 )

-SET(CONFIG_DLL_D
-	${DLL_D_AND_R}
-	${DLL_D_QT_CORE}
-	${DLL_D_QT_CUI}
-	${DLL_D_QT_WIDGETS}
-	${DLL_D_QWINDOWS}
-	${DLL_D_QMINIMAL}
-	${DLL_D_MSVCR}
-	${DLL_D_MSVCP}
-)
-FILE(COPY ${CONFIG_DLL_D} DESTINATION ${CONFIG_DIRECTORY_DEBUG})
-
-SET(CONFIG_DLL_R
-	${DLL_D_AND_R}
-	${DLL_R_QT_CORE}
-	${DLL_R_QT_CUI}
-	${DLL_R_QT_WIDGETS}
-	${DLL_R_QWINDOWS}
-	${DLL_R_QMINIMAL}
-	${DLL_R_MSVCR}
-	${DLL_R_MSVCP}
-)
-FILE(COPY ${CONFIG_DLL_R} DESTINATION ${CONFIG_DIRECTORY_RELEASE})
-
+FIND_FILE(DLL_GLES libEGL.dll    PATHS ${QT_LIBRARY_DIR})
+FIND_FILE(DLL_EGL  libGLESv2.dll PATHS ${QT_LIBRARY_DIR})
 SET(CONFIG_DLL_OPTIONAL
 	${DLL_GLES}
 	${DLL_EGL}
 )
+
+FIND_FILE(DLL_QT_CORE_R     Qt5Core.dll     PATHS ${QT_LIBRARY_DIR})
+FIND_FILE(DLL_QT_CORE_D     Qt5Cored.dll    PATHS ${QT_LIBRARY_DIR})
+FIND_FILE(DLL_QT_CUI_R      Qt5Gui.dll      PATHS ${QT_LIBRARY_DIR})
+FIND_FILE(DLL_QT_CUI_D      Qt5Guid.dll     PATHS ${QT_LIBRARY_DIR})
+FIND_FILE(DLL_QT_WIDGETS_R  Qt5Widgets.dll  PATHS ${QT_LIBRARY_DIR})
+FIND_FILE(DLL_QT_WIDGETS_D  Qt5Widgetsd.dll PATHS ${QT_LIBRARY_DIR})
+
+FIND_FILE(DLL_PLUGINS_QWINDOWS_R qwindows.dll  PATHS ${QT_PLUGINS_PLATFORMS_DIR})
+FIND_FILE(DLL_PLUGINS_QWINDOWS_D qwindowsd.dll PATHS ${QT_PLUGINS_PLATFORMS_DIR})
+FIND_FILE(DLL_PLUGINS_QMINIMAL_R qminimal.dll  PATHS ${QT_PLUGINS_PLATFORMS_DIR})
+FIND_FILE(DLL_PLUGINS_QMINIMAL_D qminimald.dll PATHS ${QT_PLUGINS_PLATFORMS_DIR})
+
+IF (MSVC90)
+	FIND_FILE(DLL_MSVCR_D msvcp90d.dll)
+	FIND_FILE(DLL_MSVCP_D msvcr90d.dll)
+	FIND_FILE(DLL_MSVCR_R msvcp90.dll)
+	FIND_FILE(DLL_MSVCP_R msvcr90.dll)
+ELSE()
+	FIND_FILE(DLL_MSVCP_D msvcp100d.dll)
+	FIND_FILE(DLL_MSVCR_D msvcr100d.dll)
+	FIND_FILE(DLL_MSVCP_R msvcp100.dll)
+	FIND_FILE(DLL_MSVCR_R msvcr100.dll)
+ENDIF()
+
+SET(CONFIG_DLL_D
+	${DLL_D_AND_R}
+	${DLL_QT_CORE_D}
+	${DLL_QT_CUI_D}
+	${DLL_QT_WIDGETS_D}
+	${DLL_MSVCR_D}
+	${DLL_MSVCP_D}
+)
+SET(CONFIG_PLUGINS_PLATFORM_D
+	${DLL_PLUGINS_QWINDOWS_D}
+	${DLL_PLUGINS_QMINIMAL_D}
+)
+FILE(COPY ${CONFIG_DLL_D}              DESTINATION ${CONFIG_DIRECTORY_DEBUG})
+FILE(COPY ${CONFIG_PLUGINS_PLATFORM_D} DESTINATION ${CONFIG_DIRECTORY_DEBUG}/${QT_PLUGINS_PLATFORMS})
+
+SET(CONFIG_DLL_R
+	${DLL_D_AND_R}
+	${DLL_QT_CORE_R}
+	${DLL_QT_CUI_R}
+	${DLL_QT_WIDGETS_R}
+	${DLL_MSVCR_R}
+	${DLL_MSVCP_R}
+)
+SET(CONFIG_PLUGINS_PLATFORM_R
+	${DLL_PLUGINS_QWINDOWS_R}
+	${DLL_PLUGINS_QMINIMAL_R}
+)
+FILE(COPY ${CONFIG_DLL_R}              DESTINATION ${CONFIG_DIRECTORY_RELEASE})
+FILE(COPY ${CONFIG_PLUGINS_PLATFORM_R} DESTINATION ${CONFIG_DIRECTORY_RELEASE}/${QT_PLUGINS_PLATFORMS})

 FOREACH(DLL_FILE_NAME ${CONFIG_DLL_OPTIONAL})
 	IF(DLL_FILE_NAME)


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


uname support

uname support

--- src/soxconfig.h.cmake
+++ src/soxconfig.h.cmake
@@ -36,6 +36,7 @@
 #cmakedefine HAVE_SYS_TIMEB_H         1
 #cmakedefine HAVE_SYS_TIME_H          1
 #cmakedefine HAVE_SYS_TYPES_H         1
+#cmakedefine HAVE_SYS_UTSNAME_H       1
 #cmakedefine HAVE_UNISTD_H            1
 #cmakedefine HAVE_VSNPRINTF           1
 #cmakedefine HAVE_WAVPACK             1


SVN_SILENT made messages (.desktop file)

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -73,7 +73,7 @@
 Comment[kk]=Phonon VLC тетігі
 Comment[ko]=Phonon VLC 백엔드
 Comment[lt]=Phonon VLC galinė sąsaja
-Comment[mr]=फोनोन व्ही-एल-सी बॅकएन्ड
+Comment[mr]=फोनॉन व्ही-एल-सी बॅकएन्ड
 Comment[nb]=Phonon VLC-motor
 Comment[nds]=VLC-Hülpprogramm för Phonon
 Comment[nl]=VLC-backend van Phonon


SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

--- src/vlc.desktop.cmake
+++ src/vlc.desktop.cmake
@@ -29,6 +29,7 @@
 Name[ga]=VLC
 Name[gl]=VLC
 Name[hu]=VLC
+Name[id]=VLC
 Name[it]=VLC
 Name[kk]=VLC
 Name[ko]=VLC
@@ -77,6 +78,7 @@
 Comment[ga]=Inneall VLC Phonon
 Comment[gl]=Infraestrutura de VLC para Phonon
 Comment[hu]=Phonon VLC-backend
+Comment[id]=Backend phonon VLC
 Comment[it]=Motore VLC di Phonon
 Comment[kk]=Phonon VLC тетігі
 Comment[ko]=Phonon VLC 백엔드


fixes issue 869
+ only use $ENV{NUMBER_OF_PROCESSORS} if set

SVN-Revision: 1537

--- suite/runsuite_common_pre.cmake
+++ suite/runsuite_common_pre.cmake
@@ -239,7 +239,9 @@

   # Windows:
   if(WIN32)
-    set(PROCESSOR_COUNT "$ENV{NUMBER_OF_PROCESSORS}")
+    if ($ENV{NUMBER_OF_PROCESSORS})
+      set(PROCESSOR_COUNT "$ENV{NUMBER_OF_PROCESSORS}")
+    endif ()
   endif()
 endif()


Updated include dir

Updated include dir

--- superbuild/External-Boost.cmake
+++ superbuild/External-Boost.cmake
@@ -31,8 +31,8 @@

 ExternalProject_Add(Boost
   BUILD_IN_SOURCE 1
-  URL ${Boost_url}
-  URL_MD5 ${Boost_md5}
+  URL ${Boost_url}
+  URL_MD5 ${Boost_md5}
   UPDATE_COMMAND ""
   CONFIGURE_COMMAND ${Boost_Bootstrap_Command} --prefix=${INSTALL_DEPECENCIES_DIR}/lib
   BUILD_COMMAND ${Boost_b2_Command} install -j8   --prefix=${INSTALL_DEPECENCIES_DIR} --with-thread --with-system address-model=${Boost_address_model}
@@ -40,7 +40,7 @@
 )

 if( WIN32 )
-  set( Boost_INCLUDE_DIR ${INSTALL_DEPECENCIES_DIR}/include/boost-1_55 )
+  set( Boost_INCLUDE_DIR ${INSTALL_DEPECENCIES_DIR}/include/boost-1_56 )
   set( BOOST_ROOT ${INSTALL_DEPECENCIES_DIR} )
 else()
   set( Boost_INCLUDE_DIR ${INSTALL_DEPECENCIES_DIR}/include )


update version for 1.0

update version for 1.0

--- superbuild/versions.cmake
+++ superbuild/versions.cmake
@@ -85,7 +85,7 @@

 add_revision(nuclearRGG
   GIT_REPOSITORY https://github.com/Kitware/RGG
-  GIT_TAG 4186f7ce3af93e23d1864d5f8624ea5c9afd109c)
+  GIT_TAG 4a3bc58d02cf92d8b582154ddcae32e9d1117a5d)

 add_revision(vtk
   GIT_REPOSITORY git://vtk.org/VTK.git


Pass include paths when emitting macOS swiftmodule for zippered libraries (#34547)

This matches the behaviour for emitting macCatalyst swiftmodules and should avoid preferring dependencies from the SDK instead of just built ones.

Addresses rdar://70682224

--- stdlib/cmake/modules/SwiftSource.cmake
+++ stdlib/cmake/modules/SwiftSource.cmake
@@ -664,6 +664,12 @@
       math(EXPR old_interface_file_index "${interface_file_index} + 1")
       list(REMOVE_AT maccatalyst_swift_module_flags ${old_interface_file_index})
     endif()
+
+    # We still need to change the main swift flags
+    # so we can use the correct modules
+    # when building for macOS
+    list(APPEND swift_flags
+      "-I" "${SWIFTLIB_DIR}/${library_subdir}")
   elseif(maccatalyst_build_flavor STREQUAL "ios-like")
     compute_library_subdir(maccatalyst_library_subdir
       "MACCATALYST" "${SWIFTFILE_ARCHITECTURE}")


Do not use the new DX SDKs when building for MSVC 2008.

--- CMake/Packages/FindDirectX11.cmake
+++ CMake/Packages/FindDirectX11.cmake
@@ -31,7 +31,7 @@
 			set(DirectX11_LIBRARY d3d11.lib dxgi.lib dxguid.lib) # in "C:/Program Files (x86)/Windows Phone Kits/8.0/lib/${MSVC_CXX_ARCHITECTURE_ID}/"

 		endif()
-	else()
+	elseif( NOT MSVC90 )
 		# Windows 10.x SDK
 		if(CMAKE_CL_64)
 			set(DirectX11_LIBPATH_SUFFIX "x64")


Bugfix: FindDirectX11 would fail to detect old DX SDK June 2010 + MSVC 2008 + Windows 8. Other combinations may also not be working.

--- CMake/Packages/FindDirectX11.cmake
+++ CMake/Packages/FindDirectX11.cmake
@@ -31,7 +31,7 @@
 			set(DirectX11_LIBRARY d3d11.lib dxgi.lib dxguid.lib) # in "C:/Program Files (x86)/Windows Phone Kits/8.0/lib/${MSVC_CXX_ARCHITECTURE_ID}/"

 		endif()
-	else(WINDOWS_PHONE)
+	else()
 		# Windows 10.x SDK
 		if(CMAKE_CL_64)
 			set(DirectX11_LIBPATH_SUFFIX "x64")
@@ -65,82 +65,80 @@
 			find_path(DirectX11_INCLUDE_DIR NAMES d3d11.h HINTS "C:/Program Files (x86)/Windows Kits/8.0/include/um" "C:/Program Files/Windows Kits/8.0/include/um")
 			set(DirectX11_LIBRARY d3d11.lib dxgi.lib dxguid.lib) # in "C:/Program Files (x86)/Windows Kits/8.0/lib/win8/um/${MSVC_CXX_ARCHITECTURE_ID}/"
 		endif()
-	endif(WINDOWS_PHONE)
+	endif()

 	# Legacy Direct X SDK
-	if(NOT DirectX11_INCLUDE_DIR)
+	if( NOT DirectX11_INCLUDE_DIR OR NOT DirectX11_LIBRARY )
+		# Get path, convert backslashes as ${ENV_DXSDK_DIR}
+		getenv_path(DXSDK_DIR)
+		getenv_path(DIRECTX_HOME)
+		getenv_path(DIRECTX_ROOT)
+		getenv_path(DIRECTX_BASE)

-	# Get path, convert backslashes as ${ENV_DXSDK_DIR}
-	getenv_path(DXSDK_DIR)
-	getenv_path(DIRECTX_HOME)
-	getenv_path(DIRECTX_ROOT)
-	getenv_path(DIRECTX_BASE)
+		# construct search paths
+		set(DirectX11_PREFIX_PATH
+		"${DXSDK_DIR}" "${ENV_DXSDK_DIR}"
+		"${DIRECTX_HOME}" "${ENV_DIRECTX_HOME}"
+		"${DIRECTX_ROOT}" "${ENV_DIRECTX_ROOT}"
+		"${DIRECTX_BASE}" "${ENV_DIRECTX_BASE}"
+		"C:/apps_x86/Microsoft DirectX SDK*"
+		"C:/Program Files (x86)/Microsoft DirectX SDK*"
+		"C:/apps/Microsoft DirectX SDK*"
+		"C:/Program Files/Microsoft DirectX SDK*"
+		"$ENV{ProgramFiles}/Microsoft DirectX SDK*"
+		)

-	# construct search paths
-	set(DirectX11_PREFIX_PATH
-	"${DXSDK_DIR}" "${ENV_DXSDK_DIR}"
-	"${DIRECTX_HOME}" "${ENV_DIRECTX_HOME}"
-	"${DIRECTX_ROOT}" "${ENV_DIRECTX_ROOT}"
-	"${DIRECTX_BASE}" "${ENV_DIRECTX_BASE}"
-	"C:/apps_x86/Microsoft DirectX SDK*"
-	"C:/Program Files (x86)/Microsoft DirectX SDK*"
-	"C:/apps/Microsoft DirectX SDK*"
-	"C:/Program Files/Microsoft DirectX SDK*"
-	"$ENV{ProgramFiles}/Microsoft DirectX SDK*"
-	)
+		create_search_paths(DirectX11)
+		# redo search if prefix path changed
+		clear_if_changed(DirectX11_PREFIX_PATH
+			DirectX11_LIBRARY
+			DirectX11_INCLUDE_DIR
+		)

-	create_search_paths(DirectX11)
-	# redo search if prefix path changed
-	clear_if_changed(DirectX11_PREFIX_PATH
-		DirectX11_LIBRARY
-		DirectX11_INCLUDE_DIR
-	)
-
-	# dlls are in DirectX11_ROOT_DIR/Developer Runtime/x64|x86
-	# lib files are in DirectX11_ROOT_DIR/Lib/x64|x86
-	if(CMAKE_CL_64)
-		set(DirectX11_LIBPATH_SUFFIX "x64")
-	else(CMAKE_CL_64)
-		set(DirectX11_LIBPATH_SUFFIX "x86")
-	endif(CMAKE_CL_64)
+		# dlls are in DirectX11_ROOT_DIR/Developer Runtime/x64|x86
+		# lib files are in DirectX11_ROOT_DIR/Lib/x64|x86
+		if(CMAKE_CL_64)
+			set(DirectX11_LIBPATH_SUFFIX "x64")
+		else(CMAKE_CL_64)
+			set(DirectX11_LIBPATH_SUFFIX "x86")
+		endif(CMAKE_CL_64)

-	# look for D3D11 components
-    find_path(DirectX11_INCLUDE_DIR NAMES d3d11.h HINTS ${DirectX11_INC_SEARCH_PATH})
-    find_library(DirectX11_DXERR_LIBRARY NAMES DxErr HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
-	find_library(DirectX11_DXGUID_LIBRARY NAMES dxguid HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
-	find_library(DirectX11_DXGI_LIBRARY NAMES dxgi HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
-	find_library(DirectX11_D3DCOMPILER_LIBRARY NAMES d3dcompiler HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
-	find_library(DirectX11_D3D11_LIBRARY NAMES d3d11 HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
-	find_library(DirectX11_D3DX11_LIBRARY NAMES d3dx11 HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
+		# look for D3D11 components
+		find_path(DirectX11_INCLUDE_DIR NAMES d3d11.h HINTS ${DirectX11_INC_SEARCH_PATH})
+		find_library(DirectX11_DXERR_LIBRARY NAMES DxErr HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
+		find_library(DirectX11_DXGUID_LIBRARY NAMES dxguid HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
+		find_library(DirectX11_DXGI_LIBRARY NAMES dxgi HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
+		find_library(DirectX11_D3DCOMPILER_LIBRARY NAMES d3dcompiler HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
+		find_library(DirectX11_D3D11_LIBRARY NAMES d3d11 HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})
+		find_library(DirectX11_D3DX11_LIBRARY NAMES d3dx11 HINTS ${DirectX11_LIB_SEARCH_PATH} PATH_SUFFIXES ${DirectX11_LIBPATH_SUFFIX})

-	if (DirectX11_INCLUDE_DIR AND DirectX11_D3D11_LIBRARY)
-	  set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES}
-	    ${DirectX11_D3D11_LIBRARY}
-	    ${DirectX11_DXGI_LIBRARY}
-        ${DirectX11_DXGUID_LIBRARY}
-        ${DirectX11_D3DCOMPILER_LIBRARY}
-      )
-    endif ()
-    if (DirectX11_D3DX11_LIBRARY)
-        set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES} ${DirectX11_D3DX11_LIBRARY})
-    endif ()
-    if (DirectX11_DXERR_LIBRARY)
-        set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES} ${DirectX11_DXERR_LIBRARY})
-    endif ()
+		if (DirectX11_INCLUDE_DIR AND DirectX11_D3D11_LIBRARY)
+		  set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES}
+			${DirectX11_D3D11_LIBRARY}
+			${DirectX11_DXGI_LIBRARY}
+			${DirectX11_DXGUID_LIBRARY}
+			${DirectX11_D3DCOMPILER_LIBRARY}
+		  )
+		endif ()
+		if (DirectX11_D3DX11_LIBRARY)
+			set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES} ${DirectX11_D3DX11_LIBRARY})
+		endif ()
+		if (DirectX11_DXERR_LIBRARY)
+			set(DirectX11_D3D11_LIBRARIES ${DirectX11_D3D11_LIBRARIES} ${DirectX11_DXERR_LIBRARY})
+		endif ()

-	set(DirectX11_LIBRARY
-		${DirectX11_D3D11_LIBRARIES}
-	)
-
-	mark_as_advanced(DirectX11_D3D11_LIBRARY
-					 DirectX11_D3DX11_LIBRARY
-					 DirectX11_DXERR_LIBRARY
-					 DirectX11_DXGUID_LIBRARY
-					 DirectX11_DXGI_LIBRARY
-					 DirectX11_D3DCOMPILER_LIBRARY)
+		set(DirectX11_LIBRARY
+			${DirectX11_D3D11_LIBRARIES}
+		)

+		mark_as_advanced(DirectX11_D3D11_LIBRARY
+						 DirectX11_D3DX11_LIBRARY
+						 DirectX11_DXERR_LIBRARY
+						 DirectX11_DXGUID_LIBRARY
+						 DirectX11_DXGI_LIBRARY
+						 DirectX11_D3DCOMPILER_LIBRARY)
 	endif () # Legacy Direct X SDK

 	findpkg_finish(DirectX11)

-endif(WIN32)+endif(WIN32)


CUDA 3.0 beta hacks no longer needed.

CUDA 3.0 beta hacks no longer needed.

git-svn-id: 4ba210d0a933e3fb1aa9ab096f190cd38965d92a@2874 fa922fa7-2fde-0310-acd8-f43f465a7996

--- CMake/hoomd/HOOMDCFlagsSetup.cmake
+++ CMake/hoomd/HOOMDCFlagsSetup.cmake
@@ -60,19 +60,6 @@
 SET(PASSED_FIRST_CONFIGURE ON CACHE INTERNAL "First configure has run: CXX_FLAGS have had their defaults changed" FORCE)
 endif(NOT PASSED_FIRST_CONFIGURE)

-# supress some warnings in nvcc generated code
-if (CMAKE_COMPILER_IS_GNUCXX)
-    # workaround for compiler warnings in nvcc generated code
-    set(CUDA_ADDITIONAL_OPTIONS "-Xcompiler;-Wno-strict-aliasing")
-    # workaround for surf errors with CUDA 3.0 beta
-    if (CUDA_VERSION VERSION_EQUAL 3.0)
-        message(STATUS "Enabling -fpermissive workaround for CUDA 3.0 beta")
-        set(CUDA_ADDITIONAL_OPTIONS "-Xcompiler;-Wno-strict-aliasing -fpermissive")
-    endif (CUDA_VERSION VERSION_EQUAL 3.0)
-else (CMAKE_COMPILER_IS_GNUCXX)
-    set(CUDA_ADDITIONAL_OPTIONS "")
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
 # add openmp compile option to the flags
 find_package(OpenMP)
 if (ENABLE_OPENMP AND OPENMP_FOUND)


Fix cmake error

Fix cmake error

--- CMake/hoomd/HOOMDCFlagsSetup.cmake
+++ CMake/hoomd/HOOMDCFlagsSetup.cmake
@@ -27,7 +27,7 @@
 endif()

 # Enable compiler warnings on gcc and clang (common compilers used by developers)
-if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-deprecated-declarations")
     set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas")
 endif()


FindVOTCA_TOOLS.cmake: fix adding eigen3 includedir

--- CMakeModules/FindVOTCA_TOOLS.cmake
+++ CMakeModules/FindVOTCA_TOOLS.cmake
@@ -43,7 +43,7 @@

 find_library(VOTCA_TOOLS_LIBRARY NAMES votca_tools HINTS ${PC_VOTCA_TOOLS_LIBRARY_DIRS} )

-set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR};${SQLITE3_INCLUDE_DIR};${EIGEN3_INCLUDE_DIRS};${MKL_INCLUDE_DIRS}" )
+set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR};${SQLITE3_INCLUDE_DIR};${EIGEN3_INCLUDE_DIR};${MKL_INCLUDE_DIRS}" )
 set(VOTCA_TOOLS_LIBRARIES "${VOTCA_TOOLS_LIBRARY};${MKL_LIBRARIES}" )

 include(FindPackageHandleStandardArgs)


A couple of minor improvements to FindCairo (#3535)

* - allow defining a specific path to Cairo libraries and headers
- link against Xau library if needed

* changes in response to review

* removed the libXau bit as it is not needed

--- Code/cmake/Modules/FindCairo.cmake
+++ Code/cmake/Modules/FindCairo.cmake
@@ -38,18 +38,20 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_CAIRO cairo) # FIXME: After we require CMake 2.8.2 we can pass QUIET to this call.
+PKG_CHECK_MODULES(PC_CAIRO cairo QUIET)

 FIND_PATH(CAIRO_INCLUDE_DIRS
     NAMES cairo.h
-    HINTS ${PC_CAIRO_INCLUDEDIR}
+    HINTS ${CAIRO_INCLUDE_DIR}
+          ${PC_CAIRO_INCLUDEDIR}
           ${PC_CAIRO_INCLUDE_DIRS}
     PATH_SUFFIXES cairo
 )

 FIND_LIBRARY(CAIRO_LIBRARIES
     NAMES cairo
-    HINTS ${PC_CAIRO_LIBDIR}
+    HINTS ${CAIRO_LIBRARY_DIR}
+          ${PC_CAIRO_LIBDIR}
           ${PC_CAIRO_LIBRARY_DIRS}
 )

@@ -70,13 +72,10 @@
     ENDIF ()
 ENDIF ()

-# FIXME: Should not be needed anymore once we start depending on CMake 2.8.3
 SET(VERSION_OK TRUE)
 IF (Cairo_FIND_VERSION)
     IF (Cairo_FIND_VERSION_EXACT)
-        IF ("${Cairo_FIND_VERSION}" VERSION_EQUAL "${CAIRO_VERSION}")
-            # FIXME: Use IF (NOT ...) with CMake 2.8.2+ to get rid of the ELSE block
-        ELSE ()
+        IF (NOT "${Cairo_FIND_VERSION}" VERSION_EQUAL "${CAIRO_VERSION}")
             SET(VERSION_OK FALSE)
         ENDIF ()
     ELSE ()


nomsg

nomsg

--- otbIncludeDirectories.cmake
+++ otbIncludeDirectories.cmake
@@ -30,6 +30,11 @@
 SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
   ${OTB_INSTALL_INCLUDE_DIR}
   ${OTB_INSTALL_INCLUDE_DIR}/Common
+  ${OTB_INSTALL_INCLUDE_DIR}/IO
+  ${OTB_INSTALL_INCLUDE_DIR}/ChangeDetection
+  ${OTB_INSTALL_INCLUDE_DIR}/FeatureExtraction
+  ${OTB_INSTALL_INCLUDE_DIR}/Learning
+  ${OTB_INSTALL_INCLUDE_DIR}/Visu
 )

 #IF(NOT OTB_USE_SYSTEM_VXL)


Prevent configuration error if !OGRE_BUILD_PLUGIN_CG and ${Cg_BINARY_DBG} is empty

--- CMake/InstallDependencies.cmake
+++ CMake/InstallDependencies.cmake
@@ -260,22 +260,24 @@
 		endif()
 	endif()

-    if (OGRE_BUILD_PLUGIN_CG AND EXISTS ${Cg_BINARY_DBG} AND EXISTS ${Cg_BINARY_REL})
-      # if MinGW or NMake, the release/debug cg.dll's would conflict, so just pick one
-      if (MINGW OR (CMAKE_GENERATOR STREQUAL "NMake Makefiles"))
-        if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-          file(COPY ${Cg_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
+    if (OGRE_BUILD_PLUGIN_CG)
+      if (EXISTS ${Cg_BINARY_DBG} AND EXISTS ${Cg_BINARY_REL})
+        # if MinGW or NMake, the release/debug cg.dll's would conflict, so just pick one
+        if (MINGW OR (CMAKE_GENERATOR STREQUAL "NMake Makefiles"))
+          if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+            file(COPY ${Cg_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
+          else ()
+            file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
+      			file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
+      			file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
+          endif ()
         else ()
-          file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
-    			file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
-    			file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
+            file(COPY ${Cg_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
+      		file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
+      		file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
+      		file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
         endif ()
-      else ()
-            file(COPY ${Cg_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
-    		file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
-    		file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
-    		file(COPY ${Cg_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
-      endif ()
+      endif()
     endif()

     if (OGRE_BUILD_RENDERSYSTEM_GLES)


Fixed CMake warning message when not using MPI-CUDA

--- CMake/hoomd/HOOMDMPISetup.cmake
+++ CMake/hoomd/HOOMDMPISetup.cmake
@@ -44,7 +44,7 @@
            message(STATUS "Enabling MPI<->CUDA interoperability.")
            option(ENABLE_MPI_CUDA "Enable MPI<->CUDA interoperability" on)
         else(MPI_CUDA)
-           message(STATUS "MPI found, but without CUDA interoperability. Expect slower MPI performance.")
+           message(STATUS "MPI found, but without CUDA interoperability.")
            option(ENABLE_MPI_CUDA "Enable MPI<->CUDA interoperability" off)
         endif(MPI_CUDA)
     endif (ENABLE_CUDA AND NOT DEFINED ENABLE_MPI_CUDA)


Add newline

Add newline

--- tools/cmake/app.cmake
+++ tools/cmake/app.cmake
@@ -22,4 +22,4 @@

 # set executable suffix (has to be done after enabling languages)
 # Note: This is nice to have, but is also required because STM32Cube will only work on files with a .elf extension
-set(CMAKE_EXECUTABLE_SUFFIX .elf)+set(CMAKE_EXECUTABLE_SUFFIX .elf)


work around ccache clang problem

work around ccache clang problem

--- CMake/cotire.cmake
+++ CMake/cotire.cmake
@@ -1839,6 +1839,15 @@
 	if (_option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
+	elseif (_option_COMPILER_ID MATCHES "Clang")
+		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
+			_option_COMPILER_EXECUTABLE MATCHES "ccache")
+			# Clang seems to embed a compilation timestamp into the precompiled header binary,
+			# which results in "file has been modified since the precompiled header was built"
+			# errors if ccache is used. We work around the problem by disabling ccache upon
+			# pre-compiling the prefix header.
+			set (ENV{CCACHE_DISABLE} "true")
+		endif()
 	endif()
 	execute_process(
 		COMMAND ${_cmd}


fixed bug that prevented multiple arguments to be passed to coverage run

--- CodeCoverage.cmake
+++ CodeCoverage.cmake
@@ -146,11 +146,11 @@
 function(add_coverage_run name command)
   if(CMAKE_HOST_UNIX)
     set(failsafe_command
-      ${command} ${ARGV2} > /dev/null ||
+      ${command} ${ARGN} > /dev/null ||
         ${CMAKE_COMMAND} -E echo "Coverage run returned non-zero exit code")
   elseif(CMAKE_HOST_WIN32)
     set(failsafe_command
-      ${command} ${ARGV2} > NUL ||
+      ${command} ${ARGN} > NUL ||
         ${CMAKE_COMMAND} -E echo "Coverage run returned non-zero exit code")
   else()
     message(


Fixed a bug where svnversion not executed even if found.

-This line, and those below, will be ignored--

M    RageCommon.cmake

--- RageCommon.cmake
+++ RageCommon.cmake
@@ -34,11 +34,11 @@
 )

 macro( svn_repository_version DESTVAR TOPDIR )
-	# Only work if ${SVNVERSION} exist (prog founded)
-	IF(${SVNVERSION})
+	# Only work if SVNVERSION exist (prog founded)
+	IF(SVNVERSION)
 		exec_program( ${SVNVERSION} ${TOPDIR} ARGS "." OUTPUT_VARIABLE DESTVARORI )
 		STRING(REGEX REPLACE "(.+):(.+)" "\\1_\\2" ${DESTVAR} ${DESTVARORI})
-	ENDIF(${SVNVERSION})
+	ENDIF(SVNVERSION)
 endmacro( svn_repository_version )


cmake: Default TCAM_DOWNLOAD_MESON to ON

--- CMakeOptions.cmake
+++ CMakeOptions.cmake
@@ -27,7 +27,7 @@

 option(TCAM_INTERNAL_ARAVIS "Use internal aravis dependency instead of system libraries" ON)
 option(TCAM_ARAVIS_USB_VISION "Use aravis usb vision backend. Disables v4l2." OFF)
-option(TCAM_DOWNLOAD_MESON "Download version of meson for compilation purposes" OFF)
+option(TCAM_DOWNLOAD_MESON "Download version of meson for compilation purposes" ON)

 option(TCAM_INSTALL_FORCE_PREFIX "Force CMAKE_INSTALL_PREFIX onto all tiscamera parts. Only works with custom prefix." OFF)


STYLE: Fixed spacing between parenthesis

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -7,7 +7,7 @@
 #
 # All rights reserved.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 ( the "License" );
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -20,32 +20,32 @@
 # limitations under the License.
 #
 ##############################################################################
-include(ExternalProject)
-
-set(base "${CMAKE_BINARY_DIR}")
-set_property(DIRECTORY PROPERTY EP_BASE ${base})
-
-set(shared ON) # use for BUILD_SHARED_LIBS on all subsequent projects
-set(testing OFF) # use for BUILD_TESTING on all subsequent projects
-set(build_type "Debug")
-if(CMAKE_BUILD_TYPE)
-  set(build_type "${CMAKE_BUILD_TYPE}")
+include( ExternalProject )
+
+set( base "${CMAKE_BINARY_DIR}" )
+set_property( DIRECTORY PROPERTY EP_BASE ${base} )
+
+set( shared ON ) # use for BUILD_SHARED_LIBS on all subsequent projects
+set( testing OFF ) # use for BUILD_TESTING on all subsequent projects
+set( build_type "Debug" )
+if( CMAKE_BUILD_TYPE )
+  set( build_type "${CMAKE_BUILD_TYPE}" )
 endif()

 set( TubeTK_DEPENDS "" )

-set(gen "${CMAKE_GENERATOR}")
+set( gen "${CMAKE_GENERATOR}" )

 ##
 ## Check if sytem ITK or superbuild ITK
 ##
-if(NOT USE_SYSTEM_ITK)
+if( NOT USE_SYSTEM_ITK )

   ##
   ## Insight
   ##
-  set(proj Insight)
-  ExternalProject_Add(${proj}
+  set( proj Insight )
+  ExternalProject_Add( ${proj}
     GIT_REPOSITORY "http://github.com/Slicer/ITK.git"
     GIT_TAG "v3.20.0"
     SOURCE_DIR "${CMAKE_BINARY_DIR}/Insight"
@@ -69,7 +69,7 @@

   set( TubeTK_DEPENDS ${TubeTK_DEPENDS} "Insight" )

-endif(NOT USE_SYSTEM_ITK)
+endif( NOT USE_SYSTEM_ITK )

 ##
 ## VTK
@@ -79,15 +79,15 @@
   ##
   ## Check if sytem VTK or superbuild VTK
   ##
-  if(NOT USE_SYSTEM_VTK)
+  if( NOT USE_SYSTEM_VTK )

     if( TubeTK_USE_QT )

       ##
       ## VTK
       ##
-      set(proj VTK)
-      ExternalProject_Add(${proj}
+      set( proj VTK )
+      ExternalProject_Add( ${proj}
         GIT_REPOSITORY "http://github.com/Slicer/VTK.git"
         GIT_TAG "origin/slicer-4.0"
         SOURCE_DIR "${CMAKE_BINARY_DIR}/VTK"
@@ -116,8 +116,8 @@
       ##
       ## VTK
       ##
-      set(proj VTK)
-      ExternalProject_Add(${proj}
+      set( proj VTK )
+      ExternalProject_Add( ${proj}
         GIT_REPOSITORY "http://vtk.org/VTK.git"
         SOURCE_DIR "${CMAKE_BINARY_DIR}/VTK"
         BINARY_DIR VTK-Build
@@ -141,7 +141,7 @@

     set( TubeTK_DEPENDS ${TubeTK_DEPENDS} "VTK" )

-  endif(NOT USE_SYSTEM_VTK)
+  endif( NOT USE_SYSTEM_VTK )

 endif( TubeTK_USE_VTK )

@@ -149,8 +149,8 @@
 ##
 ## TCLAP
 ##
-set(proj tclap)
-ExternalProject_Add(${proj}
+set( proj tclap )
+ExternalProject_Add( ${proj}
   SVN_REPOSITORY
     "http://svn.slicer.org/Slicer3/trunk/Libs/SlicerExecutionModel/tclap"
   SOURCE_DIR tclap
@@ -173,14 +173,14 @@
 ##
 ## ModuleDescriptionParser
 ##
-set(proj ModuleDescriptionParser)
-if(NOT USE_SYSTEM_ITK)
+set( proj ModuleDescriptionParser )
+if( NOT USE_SYSTEM_ITK )
   # Depends on ITK if ITK was build using superbuild
-  set(ModuleDescriptionParser_DEPENDS "Insight")
-else(NOT USE_SYSTEM_ITK)
-  set(ModuleDescriptionParser_DEPENDS "")
-endif(NOT USE_SYSTEM_ITK)
-ExternalProject_Add(${proj}
+  set( ModuleDescriptionParser_DEPENDS "Insight" )
+else( NOT USE_SYSTEM_ITK )
+  set( ModuleDescriptionParser_DEPENDS "" )
+endif( NOT USE_SYSTEM_ITK )
+ExternalProject_Add( ${proj}
   SVN_REPOSITORY
     "http://svn.slicer.org/Slicer3/trunk/Libs/SlicerExecutionModel/ModuleDescriptionParser"
   SOURCE_DIR ModuleDescriptionParser
@@ -205,8 +205,8 @@
 ##
 ## GenerateCLP
 ##
-set(proj GenerateCLP)
-ExternalProject_Add(${proj}
+set( proj GenerateCLP )
+ExternalProject_Add( ${proj}
   SVN_REPOSITORY
     "http://svn.slicer.org/Slicer3/trunk/Libs/SlicerExecutionModel/GenerateCLP"
   SOURCE_DIR GenerateCLP
@@ -238,8 +238,8 @@
 ##
 if( TubeTK_USE_OpenIGTLink )

-  set(proj OpenIGTLink)
-  ExternalProject_Add(${proj}
+  set( proj OpenIGTLink )
+  ExternalProject_Add( ${proj}
     SVN_REPOSITORY "http://svn.na-mic.org/NAMICSandBox/trunk/OpenIGTLink"
     SOURCE_DIR OpenIGTLink
     BINARY_DIR OpenIGTLink-Build
@@ -272,8 +272,8 @@
   ##
   if( TubeTK_USE_CTK )

-    set(proj CTK)
-    ExternalProject_Add(CTK
+    set( proj CTK )
+    ExternalProject_Add( CTK
       GIT_REPOSITORY "http://github.com/commontk/CTK.git"
       SOURCE_DIR "${CMAKE_BINARY_DIR}/CTK"
       BINARY_DIR CTK-Build
@@ -309,8 +309,8 @@
 ##
 ## TubeTK - Normal Build
 ##
-set(proj TubeTK)
-ExternalProject_Add(${proj}
+set( proj TubeTK )
+ExternalProject_Add( ${proj}
   DOWNLOAD_COMMAND ""
   SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
   BINARY_DIR TubeTK-Build
@@ -345,5 +345,5 @@
   INSTALL_COMMAND ""
   DEPENDS
     ${TubeTK_DEPENDS}
-)
-
+ )
+


Fixed error on target_property of non existing target

--- UseDoxygen.cmake
+++ UseDoxygen.cmake
@@ -109,10 +109,9 @@

 	configure_file(${DOXYFILE_IN} Doxyfile IMMEDIATE @ONLY)

-	get_target_property(DOC_TARGET doc TYPE)
-	if(NOT DOC_TARGET)
-		add_custom_target(doc)
-	endif()
+  if(NOT TARGET doc)
+    add_custom_target(doc)
+  endif()

 	add_dependencies(doc doxygen)
 endif()


Suppress some commented code

Suppress some commented code

--- share/FindLustre.cmake
+++ share/FindLustre.cmake
@@ -17,7 +17,7 @@
 #                  LUS_FILES <Lustre files>
 #                  [USER_C_FILES <C files>]
 #                  [VERBOSE <level>]
-#		   [LUSI]
+#                  [LUSI]
 #                  LIBNAME <libraryName>)
 #
 # When used the Lustre_Compile macro define the variable
@@ -80,7 +80,7 @@

   if(LUS_LUSI)
     set(LUSTRE_LUSI_OPT "-lusi")
-  endif()
+  endif()

   if (NOT LUS_LIBNAME)
     message(FATAL_ERROR "You should specify LIBNAME for each Lustre_Compile call.")
@@ -118,9 +118,7 @@
     if (LUS_LUSI)
       add_custom_command(
          OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${LFILE}i
-         #OUTPUT ${LUSTRE_OUTPUT_DIR}/${L}.lusi
-      	 COMMAND ${LUSTRE_COMPILER} ${LUSTRE_LUSI_OPT} ${LFILE}
-	 #COMMAND ${CMAKE_COMMAND} -E rename ${L}.lusi ${LUSTRE_OUTPUT_DIR}/${L}.lusi
+         COMMAND ${LUSTRE_COMPILER} ${LUSTRE_LUSI_OPT} ${LFILE}
          DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${LFILE}
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
          COMMENT "Compile Lustre source(s): ${LFILE} with option -lusi."


Minor RHEL6 fix

Minor RHEL6 fix

--- GPUSD.cmake
+++ GPUSD.cmake
@@ -3,8 +3,8 @@
   set(GPUSD_FOUND 1)
 endif()

-if(${EQ_REVISION} STREQUAL "")
-  message(WARNING "git not found, automatic submodule configuration not done")
+if("${EQ_REVISION}" STREQUAL "")
+  message(STATUS "git not found, automatic submodule configuration not done")
   return()
 endif()


ENH: CI: PKG: (Temporarily) disabled package testing.

--- CI/main_packages.cmake
+++ CI/main_packages.cmake
@@ -99,14 +99,14 @@
 endif()

-ctest_test(
-  PARALLEL_LEVEL 1
-  RETURN_VALUE _test_rv
-  CAPTURE_CMAKE_ERROR _test_error
-  )
+# ctest_test(
+#   PARALLEL_LEVEL 1
+#   RETURN_VALUE _test_rv
+#   CAPTURE_CMAKE_ERROR _test_error
+#   )

-if( NOT _test_rv EQUAL 0 )
-  message( SEND_ERROR "An error occurs during ctest_test.")
-endif()
+# if( NOT _test_rv EQUAL 0 )
+#   message( SEND_ERROR "An error occurs during ctest_test.")
+# endif()

 ctest_submit()


COMP: do not do things twice - GDAL_INCLUDE_DIR and GDAL_LIBRARY are checked in FindGDAL.cmake

--- CMake/ImportGdal.cmake
+++ CMake/ImportGdal.cmake
@@ -6,26 +6,17 @@
 IF(OTB_USE_EXTERNAL_GDAL)

   FIND_PACKAGE(GDAL)
-  MARK_AS_ADVANCED(GDAL_CONFIG)
-
-  IF (NOT GDAL_FOUND)
-    FIND_PATH(GDAL_INCLUDE_DIR NAMES gdal.h PATHS $ENV{GDAL_INCLUDE_DIR} /usr/include/gdal ${OSGEO4W_INCLUDE})
-    FIND_LIBRARY(GDAL_LIBRARY NAMES gdal gdal_i PATHS /usr/lib/gdal ${OSGEO4W_LIB})
-  ENDIF(NOT GDAL_FOUND)
   MARK_AS_ADVANCED(GDAL_INCLUDE_DIR)
   MARK_AS_ADVANCED(GDAL_LIBRARY)
-
-  IF (NOT GDAL_INCLUDE_DIR)
-  MESSAGE(FATAL_ERROR
-           "Cannot find GDAL include directory. Please set GDAL_INCLUDE_DIR.")
-  ENDIF (NOT GDAL_INCLUDE_DIR)
+  MARK_AS_ADVANCED(GDAL_CONFIG)
+
+  IF (NOT GDAL_FOUND)
+     MESSAGE(FATAL_ERROR
+             "Cannot find GDAL. Set GDAL_INCLUDE_DIR and GDAL_LIBRARY")
+  ENDIF(NOT GDAL_FOUND)

   INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})

-  IF (NOT GDAL_LIBRARY)
-    MESSAGE(FATAL_ERROR
-             "Cannot find GDAL library. Please set GDAL_LIBRARY.")
-  ENDIF (NOT GDAL_LIBRARY)
   MESSAGE(STATUS "  GDAL includes : ${GDAL_INCLUDE_DIR}")
   MESSAGE(STATUS "  GDAL library  : ${GDAL_LIBRARY}")


Remove the last purple stuff

Remove the last purple stuff

--- PurpleInstallPDB.cmake
+++ PurpleInstallPDB.cmake
@@ -1,20 +0,0 @@
-##
-# Copyright (c) 2010 Daniel Pfeifer, All rights reserved.
-#
-# This file is freely distributable without licensing fees and
-# is provided without guarantee or warrantee expressed or implied.
-# This file is -not- in the public domain.
-##
-
-function(PURPLE_INSTALL_PDB TARGET)
-  if(MSVC)
-    cmake_policy(SET CMP0026 OLD)
-    get_target_property(THIS_LOCATION ${TARGET} LOCATION)
-    if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
-      string(REPLACE "${CMAKE_CFG_INTDIR}" "\${BUILD_TYPE}" THIS_LOCATION ${THIS_LOCATION})
-    endif()
-    get_filename_component(THIS_EXTENSION ${THIS_LOCATION} EXT)
-    string(REGEX REPLACE "${THIS_EXTENSION}$" ".pdb" THIS_PDB ${THIS_LOCATION})
-    install(FILES ${THIS_PDB} CONFIGURATIONS Debug RelWithDebInfo ${ARGN})
-  endif(MSVC)
-endfunction(PURPLE_INSTALL_PDB)


Make some clarifications in ToolchainExample.cmake

--- ToolchainExample.cmake
+++ ToolchainExample.cmake
@@ -1,20 +1,25 @@
 # This is an example Toolchain file to cross-compile for ARM/MIPS/other
 # boards from x86_64. Copy & modify. Skip 4-8 if using LLVM less build
 #
+# x86_64 = "build"
+# ARM/MIPS/other board = "host" or "board"
+#
 # Steps:
-# 1) Install g++ and gcc cross-compilers
+# (note: hwloc is now optional)
+# 1) on build system, install g++ and gcc cross-compilers
 #    (apt install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf)
-# 2) On your board, install libltdl, ocl-icd and libhwloc + their development headers
-# 3) copy the entire root filesystem of the board somewhere on your host,
+# 2) On the board, install ocl-icd and libhwloc (optional) + their development headers
+# 3) copy the entire root filesystem of the board somewhere to the build system,
 #    then set CMAKE_FIND_ROOT_PATH below to this path
-# 4) Build clang and llvm for the build machine and install them. ($BUILD_PREFIX)
-# 5) Build clang and llvm for the host machine and install them. ($HOST_PREFIX)
+# 4) Build clang and llvm for the build system and install them. ($BUILD_PREFIX)
+# 5) Build clang and llvm for the host and install them. ($HOST_PREFIX)
 # 6) copy llvm-config from build to host. (cp $BUILD_PREFIX/bin/llvm-config $HOST_PREFIX/bin/llvm-config)
 # 7) Install pkg-config for build
 # 8) Install hwloc, ocl-icd for host and set `PKG_CONFIG_PATH` env variable to the paths
 #    eg: export PKG_CONFIG_PATH=/path/to/hwloc/prefix/lib/pkgconfig:/path/to/opencl/prefix/lib/pkgconfig
 # 9) run cmake like this:
-#          cmake -DHOST_DEVICE_BUILD_HASH=<SOME_HASH> -DENABLE_LLVM=<0 if LLVM-less, 1 if with LLVM>
+#          cmake -DHOST_DEVICE_BUILD_HASH=<SOME_HASH> (see below)
+#           -DENABLE_LLVM=<0 if LLVM-less, 1 if with LLVM>
 #           -DCMAKE_TOOLCHAIN_FILE=<path-to-this-file>
 #           -DCMAKE_PREFIX_PATH=$HOST_PREFIX
 #           -DLLC_TRIPLE=<your-triple (e.g.arm-gnueabihf-linux-gnu)
@@ -22,6 +27,11 @@
 #           -DLLC_HOST_CPU=<your-cpu (e.g. armv7a)>
 #           -DLLVM_BINDIR=$BUILD_PREFIX/bin
 #           <path-to-pocl-source>
+#
+# ... where SOME_HASH is a string that can be set to anything;
+# when loading OpenCL program binaries, PoCL uses it to check
+# that the PoCL which built the binary is compatible with the
+# PoCL that's loading the binary.

 SET(CMAKE_SYSTEM_NAME Linux)


Beautify output

Beautify output

--- scripts/create-toolchain-info.cmake
+++ scripts/create-toolchain-info.cmake
@@ -75,7 +75,7 @@
 if(NOT try_compile_result)
   hunter_internal_error(
       "Compilation of ${predefined} failed. Result: ${try_compile_result}\n"
-      "Output:\n${outresult}"
+      "Output:\n--- OUTPUT BEGIN ---\n${outresult}\n--- OUTPUT END ---"
   )
 endif()


version 0.1.7, vlc version 2.1.5

version 0.1.7, vlc version 2.1.5

--- src/PluginConfig.cmake
+++ src/PluginConfig.cmake
@@ -5,7 +5,7 @@
 #
 #\**********************************************************/

-set(PLUGIN_VERSION "0.1.6")
+set(PLUGIN_VERSION "0.1.7")
 set(PLUGIN_NAME "WebChimera")
 set(PLUGIN_PREFIX "WebChimera")
 set(PLUGIN_DESCRIPTION "Web Plugin powered by Firebreath/Qt Qml/Vlc")
@@ -18,7 +18,7 @@
 #if you want embed vlc into FBVLC distribution:
 # 1) place vlc into FBVLC\Win\WiX\vlc-${VLC_VERSION}
 # 2) uncomment following line
-set(VLC_VERSION "2.1.3")
+set(VLC_VERSION "2.1.5")
 # 3) run prepXXXX.cmd from FireBreath

 # ActiveX constants:


ENH: Check for Qt5 dir

ENH: Check for Qt5 dir

--- SuperBuild.cmake
+++ SuperBuild.cmake
@@ -32,7 +32,10 @@
   set( USE_SYSTEM_SlicerExecutionModel ON CACHE BOOL "Build using an externally defined version of SlicerExecutionModel" FORCE )
   # DTIProcess_DIR is set because DTI-Reg is defined as dependent of the extension DTIProcess
   set(USE_SYSTEM_DTIProcess ON CACHE BOOL "Build using an externally defined version of DTIProcess" FORCE)
-  set(USE_QT4 ON)
+
+  if(NOT Qt5_DIR)
+    set(USE_QT4 ON)
+  endif()
 endif()

 option(USE_SYSTEM_ITK "Build using an externally defined version of ITK" OFF)


(split) COMP: Avoid warning about unused ITK_FLTK_RESOURCE.

Change-Id: I2eff49d3d4f3032437f08b744047f48806904e21

--- Superbuild.cmake
+++ Superbuild.cmake
@@ -40,6 +40,10 @@
   list( APPEND ITKApps_DEPENDENCIES FLTK )
 endif()

+set( _fltk_use_resource )
+if(APPLE AND NOT FLTK_USE_X)
+  set( _fltk_use_resource "-DITK_FLTK_RESOURCE:FILEPATH=Carbon.r" )
+endif()
 ExternalProject_Add( ITKApps
   DEPENDS ${ITKApps_DEPENDENCIES}
   DOWNLOAD_COMMAND ""
@@ -57,6 +61,6 @@
     # FLTK
     -DUSE_FLTK:BOOL=ON
     -DFLTK_DIR:PATH=${FLTK_DIR}
-    -DITK_FLTK_RESOURCE:FILEPATH=Carbon.r
+    ${_fltk_use_resource}
   INSTALL_COMMAND ""
 )


Improve definitions of ..._BUFFER_ALIGNMENT values in CMake

These values are now available unconditionally and at least 1.

--- source/distortos-sources.cmake
+++ source/distortos-sources.cmake
@@ -7,44 +7,32 @@
 # distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #

-if(DEFINED DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENTS)
-	distortosMax(DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENT ${DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENTS})
-	distortosSetFixedConfiguration(INTEGER
-			CONFIG_SDMMCCARD_BUFFER_ALIGNMENT
-			${DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENT})
-endif(DEFINED DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENTS)
+distortosMax(DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENT 1 ${DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENTS})
+distortosSetFixedConfiguration(INTEGER
+		CONFIG_SDMMCCARD_BUFFER_ALIGNMENT
+		${DISTORTOS_SDMMCCARD_BUFFER_ALIGNMENT})

-if(DEFINED DISTORTOS_SPIMASTER_BUFFER_ALIGNMENTS)
-	distortosMax(DISTORTOS_SPIMASTER_BUFFER_ALIGNMENT ${DISTORTOS_SPIMASTER_BUFFER_ALIGNMENTS})
-	distortosSetFixedConfiguration(INTEGER
-			CONFIG_SPIMASTER_BUFFER_ALIGNMENT
-			${DISTORTOS_SPIMASTER_BUFFER_ALIGNMENT})
+distortosMax(DISTORTOS_SPIMASTER_BUFFER_ALIGNMENT 1 ${DISTORTOS_SPIMASTER_BUFFER_ALIGNMENTS})
+distortosSetFixedConfiguration(INTEGER
+		CONFIG_SPIMASTER_BUFFER_ALIGNMENT
+		${DISTORTOS_SPIMASTER_BUFFER_ALIGNMENT})
+list(APPEND DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENTS ${DISTORTOS_SPIMASTER_BUFFER_ALIGNMENT})

-	list(APPEND DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENTS ${DISTORTOS_SPIMASTER_BUFFER_ALIGNMENT})
-endif(DEFINED DISTORTOS_SPIMASTER_BUFFER_ALIGNMENTS)
+distortosMax(DISTORTOS_UART_BUFFER_ALIGNMENT 1 ${DISTORTOS_UART_BUFFER_ALIGNMENTS})
+distortosSetFixedConfiguration(INTEGER
+		CONFIG_UART_BUFFER_ALIGNMENT
+		${DISTORTOS_UART_BUFFER_ALIGNMENT})

-if(DEFINED DISTORTOS_UART_BUFFER_ALIGNMENTS)
-	distortosMax(DISTORTOS_UART_BUFFER_ALIGNMENT ${DISTORTOS_UART_BUFFER_ALIGNMENTS})
-	distortosSetFixedConfiguration(INTEGER
-			CONFIG_UART_BUFFER_ALIGNMENT
-			${DISTORTOS_UART_BUFFER_ALIGNMENT})
-endif(DEFINED DISTORTOS_UART_BUFFER_ALIGNMENTS)
+distortosMax(DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENT 1 ${DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENTS})
+distortosSetFixedConfiguration(INTEGER
+		CONFIG_BLOCKDEVICE_BUFFER_ALIGNMENT
+		${DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENT})
+list(APPEND DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENTS ${DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENT})

-if(DEFINED DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENTS)
-	distortosMax(DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENT ${DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENTS})
-	distortosSetFixedConfiguration(INTEGER
-			CONFIG_BLOCKDEVICE_BUFFER_ALIGNMENT
-			${DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENT})
-
-	list(APPEND DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENTS ${DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENT})
-endif(DEFINED DISTORTOS_BLOCKDEVICE_BUFFER_ALIGNMENTS)
-
-if(DEFINED DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENTS)
-	distortosMax(DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENT ${DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENTS})
-	distortosSetFixedConfiguration(INTEGER
-			CONFIG_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENT
-			${DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENT})
-endif(DEFINED DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENTS)
+distortosMax(DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENT 1 ${DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENTS})
+distortosSetFixedConfiguration(INTEGER
+		CONFIG_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENT
+		${DISTORTOS_MEMORYTECHNOLOGYDEVICE_BUFFER_ALIGNMENT})

 target_sources(distortos PRIVATE
 		${CMAKE_CURRENT_LIST_DIR}/fatalErrorHandler.cpp)


Fix typo

Fix typo

--- CI/main_ci.cmake
+++ CI/main_ci.cmake
@@ -60,7 +60,8 @@
     SOURCE "${OTB_SOURCE_DIR}"
     OPTIONS "${CONFIGURE_OPTIONS}"
     RETURN_VALUE _configure_rv
-    CAPTURE_CMAKE_ERROR _configure_error)
+    CAPTURE_CMAKE_ERROR _configure_error
+    )

 if ( _configure_rv EQUAL -1 )
   message("An error occurs during ctest_configure:
@@ -68,8 +69,8 @@
 endif()

 ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}"
-            RETURN_VALUE _build_rv]
-            CAPTURE_CMAKE_ERROR _build_error]
+            RETURN_VALUE _build_rv
+            CAPTURE_CMAKE_ERROR _build_error
             )

 if ( _build_rv EQUAL -1 )


ENH: Update ResampleDTIlogEuclidean and DTI-Reg

--- SuperBuild/FindExternalTools.cmake
+++ SuperBuild/FindExternalTools.cmake
@@ -176,8 +176,6 @@
       -DBUILD_TESTING:BOOL=OFF
     INSTALL_COMMAND "" # No install step
     )
-  #configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild/CMakeLists-AtlasWerksLAPACK-Patched.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists-AtlasWerksLAPACK-Patched.txt @ONLY)
-  # In the patch : search before in the recompiled CLAPACK because needs to be compiled statically
 endif(COMPILE_EXTERNAL_AtlasWerks)

 # ITK and SlicerExecutionModel
@@ -495,8 +493,10 @@
 # ===== ResampleDTIlogEuclidean =====================================================
 set( SourceCodeArgs
   GIT_REPOSITORY "${git_protocol}://github.com/NIRALUser/ResampleDTIlogEuclidean.git"
-  GIT_TAG "84e691a0600128dbe1e9d41a80336e7083e73fa7" # 02/04/2013 fix comp with ITK4.4 + stat lib windows linkage error # "e78a9ea00d73a11cc52b3c457e32f1302a3403d4" # 12/20/2012
-#  URL "http://www.insight-journal.org/download/sourcecode/742/11/SourceCode11_ResampleDTIInsightJournal2.tar.gz"
+  GIT_TAG a2afcd57c931d224b91e6ce026cb499648e4f017 # 04-22-2013 addition of MatrixOffsetTransformBase support (ANTS affine tfm for DTIReg)
+# "84e691a0600128dbe1e9d41a80336e7083e73fa7" # 02/04/2013 fix comp with ITK4.4 + stat lib windows linkage error
+# "e78a9ea00d73a11cc52b3c457e32f1302a3403d4" # 12/20/2012
+# URL "http://www.insight-journal.org/download/sourcecode/742/11/SourceCode11_ResampleDTIInsightJournal2.tar.gz"
 # http://github.com/midas-journal/midas-journal-742/tree/master/ResampleDTIInsightJournal
   )
 set( CMAKE_ExtraARGS
@@ -516,7 +516,7 @@
   SVN_REPOSITORY "http://www.nitrc.org/svn/dtireg/trunk"
   SVN_USERNAME slicerbot
   SVN_PASSWORD slicer
-  SVN_REVISION -r 40 # 03/05/2013
+  SVN_REVISION -r 41 # 05/01/2013
   )
 set( CMAKE_ExtraARGS
   -DANTSTOOL:PATH=${ANTSPath}


[fixed] ${found}->found and removed assert_defined

--- cmake/BOTG.cmake
+++ cmake/BOTG.cmake
@@ -267,7 +267,7 @@
 #-------------------------------------------------------------------------------
 FUNCTION( botgMinimumCompilerVersion lang compiler min_version )
     botgCompilerMatches( ${lang} ${compiler} found )
-    IF( ${found} )
+    IF( found )
         SET(version "${CMAKE_${lang}_COMPILER_VERSION}")
         IF( "${version}" STREQUAL "" )
             MESSAGE( WARNING "CMAKE_${lang}_COMPILER_VERSION could not be discovered!")
@@ -438,9 +438,6 @@
 MACRO( botgAddTPL type need name )
     MESSAGE( STATUS "[BootsOnTheGround] adding TPL type=${type} need=${need} name=${name}...")

-    #Make sure TPL name is correct.
-    ASSERT_DEFINED(BootsOnTheGround_${name}_SOURCE_DIR)
-
     #Add dependency on BOTG version of TPL.
     APPEND_SET( ${type}_${need}_DEP_PACKAGES BootsOnTheGround_${name} )

@@ -448,7 +445,6 @@
     SET(BOTG_APPEND_TPLS ON)
     INCLUDE( "${BOTG_ROOT_DIR}/src/${name}/cmake/Dependencies.cmake" )
     SET(BOTG_APPEND_TPLS)
-
 ENDMACRO()
 #-------------------------------------------------------------------------------
 MACRO( botgRegisterTPLS )


Updated to detect build type.

Updated to detect build type.

--- FindZeroMQ.cmake
+++ FindZeroMQ.cmake
@@ -10,26 +10,30 @@
     HINTS ${PC_ZEROMQ_INCLUDE_DIRS}
 )

-#
-# find release libraries
-#
-find_library(
-    ZEROMQ_LIBRARIES_RELEASE
-    NAMES libzmq-mt-4_1_0.lib
-    HINTS ${PC_ZEROMQ_LIBRARY_DIRS}
-)
+if(CMAKE_BUILD_TYPE MATCHES "Release")
+    #
+    # find release libraries
+    #
+    find_library(
+        ZEROMQ_LIBRARIES_RELEASE
+        NAMES libzmq-mt-4_1_0.lib
+        HINTS ${PC_ZEROMQ_LIBRARY_DIRS}
+    )

-#
-# find debug libraries
-#
-find_library(
-    ZEROMQ_LIBRARIES_DEBUG
-    NAMES libzmq-mt-gd-4_1_0.lib
-    HINTS ${PC_ZEROMQ_LIBRARY_DIRS}
-)
+    set(ZEROMQ_LIBRARIES ${ZEROMQ_LIBRARIES_RELEASE})
+else()
+    #
+    # find debug libraries
+    #
+    find_library(
+        ZEROMQ_LIBRARIES_DEBUG
+        NAMES libzmq-mt-gd-4_1_0.lib
+        HINTS ${PC_ZEROMQ_LIBRARY_DIRS}
+    )

-set(ZEROMQ_LIBRARIES debug ${ZEROMQ_LIBRARIES_DEBUG}
-                     optimized ${ZEROMQ_LIBRARIES_RELEASE})
+    set(ZEROMQ_LIBRARIES ${ZEROMQ_LIBRARIES_DEBUG})
+endif()
+

 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZEROMQ DEFAULT_MSG ZEROMQ_LIBRARIES ZEROMQ_INCLUDE_DIRS)


rm empty module

rm empty module

--- modules/packager.cmake
+++ modules/packager.cmake
@@ -1 +0,0 @@
-# nothing yet