Make toxcore code C++ compatible.

It is still C code, so still compatible with C compilers as well. This
change lets us see more clearly where implicit conversions occur by
making them explicit.

1 files changed, 13 insertions, 0 deletions

diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake
index 1e49503a..b963e0de 100644
--- a/cmake/ModulePackage.cmake
+++ b/cmake/ModulePackage.cmake
@@ -1,8 +1,17 @@
 option(ENABLE_SHARED "Build shared (dynamic) libraries for all modules" ON)
 option(ENABLE_STATIC "Build static libraries for all modules" ON)
+option(COMPILE_AS_CXX "Compile all C code as C++ code" OFF)
 
 find_package(PkgConfig REQUIRED)
 
+function(add_c_executable exec)
+  if(COMPILE_AS_CXX)
+    set_source_files_properties(${ARGN} PROPERTIES LANGUAGE CXX)
+  endif()
+
+  add_executable(${exec} ${ARGN})
+endfunction()
+
 function(pkg_use_module mod)
   pkg_search_module(${mod} ${ARGN})
   if(${mod}_FOUND)
@@ -13,6 +22,10 @@ function(pkg_use_module mod)
 endfunction()
 
 function(add_module lib)
+  if(COMPILE_AS_CXX)
+    set_source_files_properties(${ARGN} PROPERTIES LANGUAGE CXX)
+  endif()
+
   if(ENABLE_SHARED)
     add_library(${lib}_shared SHARED ${ARGN})
     set_target_properties(${lib}_shared PROPERTIES OUTPUT_NAME ${lib})