fix build on Linux

jasp-stats · Sep 6, 2024 · 334410c · 334410c
1 parent 00fec77
commit 334410c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Desktop/CMakeLists.txt b/Desktop/CMakeLists.txt
@@ -150,7 +150,7 @@ target_link_libraries(
     OpenSSL::Crypto
     # FreeXL
     ${LIBFREEXL_LIBRARIES}
-    freexl::freexl
+    $<$<NOT:$<BOOL:${LINUX_LOCAL_BUILD}>>:freexl::freexl>
     # ReadStat -----------------------------------
     ${LIBREADSTAT_LIBRARIES}
     # MinGW's ReadStat

diff --git a/Desktop/data/importers/excel/excel.cpp b/Desktop/data/importers/excel/excel.cpp
@@ -31,7 +31,8 @@ Excel::Excel(const string &locator)
 
 void Excel::open()
 {
-	_fileSize = QFileInfo::size(_path);
+	QFileInfo fi(tq(_path));
+	_fileSize = fi.size();
 
 	if (_fileSize < 0)
 		throw runtime_error("Could not access file");

diff --git a/Desktop/data/importers/excelimporter.cpp b/Desktop/data/importers/excelimporter.cpp
@@ -18,6 +18,7 @@
 #include "excelimporter.h"
 #include "data/importers/excel/excel.h"
 #include "data/importers/excel/excelimportcolumn.h"
+#include <columnutils.h>
 #include <string>
 #include <QFileInfo>
 #include <QDebug>
@@ -37,7 +38,7 @@ ImportDataSet* ExcelImporter::loadFile(const std::string &locator, std::function
 	uint32_t	row;
 	uint16_t	col;
 
-	vector<ExcelImportColumn *> importColumns;
+	std::vector<ExcelImportColumn *> importColumns;
 
 	Excel excel(locator);
 	excel.open();
@@ -73,7 +74,7 @@ ImportDataSet* ExcelImporter::loadFile(const std::string &locator, std::function
 
 			for (int i = 0; i < colNames.size(); ++i) 
 			{
-				string colName = colNames[i];
+				std::string colName = colNames[i];
 				if (colName.empty()) 
 					colName = "V" + std::to_string(i + 1);
 				else if(ColumnUtils::isIntValue(colName))