Skip to content

Commit e6f1825

Browse files
committed
copy header files to keep them up to date
1 parent f1fc85a commit e6f1825

File tree

5 files changed

+8
-611
lines changed

5 files changed

+8
-611
lines changed

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
sudo apt install libxcb-xkb-dev libxcb-xkb1 libxcb-xinerama0 libxkbcommon-dev libxkbcommon-x11-dev autoconf zlib1g zlib1g-dev cmake
4141
sudo apt install gfortran build-essential flex libssl-dev libgl1-mesa-dev libsqlite3-dev
4242
sudo apt install libharfbuzz-dev libfribidi-dev libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev #required by some r packgaes
43-
sudo apt install libglpk-dev libcurl4-openssl-dev libmpfr-dev libfontconfig1-dev libcairo2-dev #required by some r packages
43+
sudo apt install libglpk-dev libcurl4-openssl-dev libmpfr-dev libfontconfig1-dev libcairo2-dev netcdf-bin #required by some r packages
4444
sudo apt install jags
4545
sudo apt install libminizip-dev # required by freexl
4646
sudo apt install librdata-dev

Desktop/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,8 @@ target_include_directories(
106106
${PROJECT_SOURCE_DIR}/CommonData
107107
${PROJECT_SOURCE_DIR}/QMLComponents
108108
# ReadStat
109-
$<$<PLATFORM_ID:Windows>:${RTOOLS_LIBREADSTAT_H}>
110109
${LIBREADSTAT_INCLUDE_DIRS}
111110
# librdata
112-
$<$<PLATFORM_ID:Windows>:${RTOOLS_LIBRDATA_H}>
113111
${LIBRDATA_INCLUDE_DIRS}
114112
# JSONCPP
115113
$<$<PLATFORM_ID:Linux>:${_PKGCONFIG_LIB_JSONCPP_INCLUDEDIR}>

Desktop/data/importers/rdataimporter.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ ImportDataSet *RDataImporter::loadFile(const std::string &locator, std::function
3939
RDataReader reader(locator);
4040
reader.open();
4141

42-
size_t rowCount, colCount;
43-
stringvec colNames;
42+
size_t rowCount, colCount;
43+
stringvec colNames;
4444

4545
rowCount = reader.getRowCount();
4646
colCount = reader.getColCount();
47-
4847
colNames = reader.getColumnNames();
4948
const auto &columns = reader.getColData();
5049

0 commit comments

Comments
 (0)