diff options
Diffstat (limited to 'cmake/ModulePackage.cmake')
-rw-r--r-- | cmake/ModulePackage.cmake | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake index 8867fc45..245e41eb 100644 --- a/cmake/ModulePackage.cmake +++ b/cmake/ModulePackage.cmake | |||
@@ -1,6 +1,5 @@ | |||
1 | option(ENABLE_SHARED "Build shared (dynamic) libraries for all modules" ON) | 1 | option(ENABLE_SHARED "Build shared (dynamic) libraries for all modules" ON) |
2 | option(ENABLE_STATIC "Build static libraries for all modules" ON) | 2 | option(ENABLE_STATIC "Build static libraries for all modules" ON) |
3 | option(COMPILE_AS_CXX "Compile all C code as C++ code" OFF) | ||
4 | 3 | ||
5 | if(NOT ENABLE_SHARED AND NOT ENABLE_STATIC) | 4 | if(NOT ENABLE_SHARED AND NOT ENABLE_STATIC) |
6 | message(WARNING | 5 | message(WARNING |
@@ -12,28 +11,6 @@ endif() | |||
12 | 11 | ||
13 | find_package(PkgConfig) | 12 | find_package(PkgConfig) |
14 | 13 | ||
15 | if(COMPILE_AS_CXX) | ||
16 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_FORMAT_MACROS=1") | ||
17 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_LIMIT_MACROS=1") | ||
18 | endif() | ||
19 | |||
20 | macro(set_source_language) | ||
21 | if(COMPILE_AS_CXX) | ||
22 | foreach(srcfile ${ARGN}) | ||
23 | get_filename_component(srcext ${srcfile} EXT) | ||
24 | if(${srcext} STREQUAL ".c") | ||
25 | set_source_files_properties(${srcfile} PROPERTIES LANGUAGE CXX) | ||
26 | endif() | ||
27 | endforeach() | ||
28 | endif() | ||
29 | endmacro() | ||
30 | |||
31 | function(add_binary exec) | ||
32 | set_source_language(${ARGN}) | ||
33 | |||
34 | add_executable(${exec} ${ARGN}) | ||
35 | endfunction() | ||
36 | |||
37 | function(pkg_use_module mod pkg) | 14 | function(pkg_use_module mod pkg) |
38 | if(PKG_CONFIG_FOUND) | 15 | if(PKG_CONFIG_FOUND) |
39 | pkg_search_module(${mod} ${pkg}) | 16 | pkg_search_module(${mod} ${pkg}) |
@@ -58,7 +35,6 @@ macro(add_submodule super lib) | |||
58 | endmacro() | 35 | endmacro() |
59 | 36 | ||
60 | function(add_module lib) | 37 | function(add_module lib) |
61 | set_source_language(${ARGN}) | ||
62 | set(${lib}_SOURCES ${ARGN} PARENT_SCOPE) | 38 | set(${lib}_SOURCES ${ARGN} PARENT_SCOPE) |
63 | 39 | ||
64 | if(ENABLE_SHARED) | 40 | if(ENABLE_SHARED) |