1 files changed, 27 insertions, 29 deletions
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 5a1144da1..de9f9edae 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -29,25 +29,45 @@ if(BLESUPPORT)
 	set(BT_CORE_SRC_FILES ${BT_CORE_SRC_FILES} qt-ble.cpp)
 endif()
 
-# compile the core library, in C.
+# compile the core library part in C, part in C++
 set(SUBSURFACE_CORE_LIB_SRCS
+	checkcloudconnection.cpp
+	cloudstorage.cpp
 	cochran.c
+	color.cpp
+	configuredivecomputer.cpp
+	configuredivecomputerthreads.cpp
+	connectionlistmodel.cpp
 	datatrak.c
 	deco.c
 	device.c
+	devicedetails.cpp
 	dive.c
+	divecomputer.cpp
+	divelogexportlogic.cpp
 	divesite.c
+	divesitehelpers.cpp
 	divesite-helper.cpp
 	divelist.c
+	downloadfromdcthread.cpp
 	equipment.c
 	errorhelper.c
+	exif.cpp
 	file.c
+	format.cpp
+	gaspressures.c
 	gas-model.c
+	gettextfromc.cpp
 	git-access.c
+	gpslocation.cpp
+	imagedownloader.cpp
+	isocialnetworkintegration.cpp
 	libdivecomputer.c
 	liquivision.c
 	load-git.c
 	membuffer.c
+	metadata.cpp
+	metrics.cpp
 	ostctools.c
 	parse-xml.c
 	parse.c
@@ -58,9 +78,10 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	import-csv.c
 	planner.c
 	plannernotes.c
+	pluginmanager.cpp
 	profile.c
-	gaspressures.c
-	worldmap-save.c
+	qthelper.cpp
+	qt-init.cpp
 	save-git.c
 	save-xml.c
 	save-html.c
@@ -68,37 +89,14 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	statistics.c
 	strtod.c
 	subsurfacestartup.c
+	subsurfacesysinfo.cpp
+	taxonomy.c
 	time.c
 	uemis.c
 	uemis-downloader.c
 	version.c
-	# gettextfrommoc should be added because we are using it on the c-code.
-	gettextfromc.cpp
-	# dirk ported some core functionality to c++.
-	qthelper.cpp
-	metadata.cpp
-	format.cpp
-	divecomputer.cpp
-	exif.cpp
-	subsurfacesysinfo.cpp
-	devicedetails.cpp
-	configuredivecomputer.cpp
-	configuredivecomputerthreads.cpp
-	divesitehelpers.cpp
-	taxonomy.c
-	checkcloudconnection.cpp
 	windowtitleupdate.cpp
-	divelogexportlogic.cpp
-	qt-init.cpp
-	metrics.cpp
-	color.cpp
-	pluginmanager.cpp
-	imagedownloader.cpp
-	isocialnetworkintegration.cpp
-	gpslocation.cpp
-	cloudstorage.cpp
-	downloadfromdcthread.cpp
-	connectionlistmodel.cpp
+	worldmap-save.c
 
 	#Subsurface Qt have the Subsurface structs QObjectified for easy access via QML.
 	subsurface-qt/DiveObjectHelper.cpp