napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clang: partman_devices.c is not, in fact, C++ code

Browse Source
This commit is contained in:
Adriaan de Groot 2017-09-21 04:16:35 -04:00
parent e3e519c06f
commit d89b17a244
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -29,7 +29,7 @@
# #
# cmake . -DSKIP_MODULES="partition luksbootkeycfg" # cmake . -DSKIP_MODULES="partition luksbootkeycfg"
project( calamares CXX ) project( calamares C CXX )
cmake_minimum_required( VERSION 3.2 ) cmake_minimum_required( VERSION 3.2 )

2
src/modules/welcome/CMakeLists.txt
View File

@ -5,8 +5,6 @@ find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
set_source_files_properties( checker/partman_devices.c PROPERTIES LANGUAGE CXX )
set( CHECKER_SOURCES set( CHECKER_SOURCES
checker/CheckItemWidget.cpp checker/CheckItemWidget.cpp
checker/CheckerWidget.cpp checker/CheckerWidget.cpp

8
src/modules/welcome/checker/partman_devices.h
View File

@ -19,6 +19,14 @@
#ifndef PARTMAN_DEVICES_H #ifndef PARTMAN_DEVICES_H
#define PARTMAN_DEVICES_H #define PARTMAN_DEVICES_H
#ifdef __cplusplus
extern "C" {
#endif
int check_big_enough(long long required_space); int check_big_enough(long long required_space);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // PARTMAN_DEVICES_H #endif // PARTMAN_DEVICES_H