Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

4 files changed, 46 insertions, 15 deletions

diff --git a/config/toolchain/build32.cmake b/config/toolchain/build32.cmake
index deb5899..a2566c3 100644
--- a/config/toolchain/build32.cmake
+++ b/config/toolchain/build32.cmake
@@ -5,10 +5,11 @@ elseif(APPLE)
   set (CMAKE_OSX_ARCHITECTURES "i386")
 elseif(MINGW)
   set (CMAKE_SYSTEM_NAME Windows)
-  set (CMAKE_C_COMPILER i686-w64-mingw32-gcc)
-  set (CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
-  set (CMAKE_RC_COMPILER i686-w64-mingw32-windres)
-  set (CMAKE_Fortran_COMPILER i686-w64-mingw32-gfortran)
+  set (TOOLCHAIN_PREFIX i686-w64-mingw32)
+  set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+  set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+  set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+  set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
 
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
   set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
@@ -34,11 +35,14 @@ elseif(MINGW)
     set (ENV{PKG_CONFIG_LIBDIR} ${LIB32}/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig)
   endif ()
 
-  set (CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
+  set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
   set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
   set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
   set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-  set (CMAKE_CROSSCOMPILING_EMULATOR wine32)
+  set (CMAKE_CROSSCOMPILING_EMULATOR wine)
+
+  include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
+  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
 else ()
   set (CMAKE_SYSTEM_NAME Linux)
 
@@ -72,4 +76,4 @@ else ()
 # for libraries and headers in the target directories
   set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
   set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif ()
\ No newline at end of file
+endif ()
diff --git a/config/toolchain/clang.cmake b/config/toolchain/clang.cmake
new file mode 100644
index 0000000..af176aa
--- /dev/null
+++ b/config/toolchain/clang.cmake
@@ -0,0 +1,16 @@
+# Uncomment the following to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_COMPILER_VENDOR "clang")
+
+if(WIN32)
+  set(CMAKE_C_COMPILER clang-cl)
+  set(CMAKE_CXX_COMPILER clang-cl)
+else()
+  set(CMAKE_C_COMPILER clang)
+  set(CMAKE_CXX_COMPILER clang++)
+endif()
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/intel.cmake b/config/toolchain/intel.cmake
index 97f6a64..ae1d2f8 100644
--- a/config/toolchain/intel.cmake
+++ b/config/toolchain/intel.cmake
@@ -3,9 +3,16 @@
 
 set(CMAKE_COMPILER_VENDOR "intel")
 
-set(CMAKE_C_COMPILER icc)
-set(CMAKE_CXX_COMPILER icpc)
-set(CMAKE_Fortran_COMPILER ifort)
+if(USE_SANITIZER)
+  set(CMAKE_C_COMPILER icl)
+  set(CMAKE_CXX_COMPILER icl++)
+  set(CMAKE_Fortran_COMPILER ifort)
+  set(INTEL_CLANG ON)
+else ()
+  set(CMAKE_C_COMPILER icc)
+  set(CMAKE_CXX_COMPILER icpc)
+  set(CMAKE_Fortran_COMPILER ifort)
+endif ()
 
 # the following is used if cross-compiling
 set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake
index 721c39a..1830488 100644
--- a/config/toolchain/mingw64.cmake
+++ b/config/toolchain/mingw64.cmake
@@ -1,10 +1,14 @@
+set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
 set (CMAKE_SYSTEM_NAME Windows)
-set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
-set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
-set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
-set (CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran)
-set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
+set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
+set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
+set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
+set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
+set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set (CMAKE_CROSSCOMPILING_EMULATOR wine64)
+
+include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")