Skip to content

Commit

Permalink
fix: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
c-dilks committed Oct 29, 2024
1 parent cc2a11c commit 4dd7efa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/install-dependency-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ case $runner in
### link homebrew's gcc, for gfortran
brew unlink gcc
brew link gcc
### link homebrew's sqlite, for RCDB
brew unlink sqlite
brew link --force sqlite
### kluge ssl linker issue (see, e.g., https://github.com/brianmario/mysql2/issues/795)
Expand Down
3 changes: 2 additions & 1 deletion src/iguana/services/RCDBReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ namespace iguana {
/// - The environment variable `RCDB_CONNECTION` (which is likely set if you are on `ifarm`)
/// - A default URL, which will be printed in a warning; see `iguana::RCDBReader::m_default_url`
///
/// RCDB will automatically use `mariadb` / `mysql` or `sqlite`, depending on the RCDB path, and whether you have satisfied the dependencies.
/// RCDB will automatically use `mariadb` / `mysql` or `sqlite`, depending on the above RCDB database path,
/// and whether you have satisfied the dependencies.
class RCDBReader : public Object
{

Expand Down
5 changes: 0 additions & 5 deletions subprojects/rcdb/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,15 @@ dbms_dict = {
'sqlite': [ 'sqlite3' ],
}
foreach dbms, pkgs : dbms_dict
found = false
foreach pkg : pkgs
dep = dependency(pkg, required: false)
if dep.found()
dbms_deps += dep
dbms_args += { 'mysql': '-DRCDB_MYSQL', 'sqlite': '-DRCDB_SQLITE' }[dbms]
message(f'using @pkg@ for RCDB DBMS')
found = true
break
endif
endforeach
# if not found
# warning(f'no dependencies found for RCDB DBMS @dbms@')
# endif
endforeach
if dbms_deps.length() == 0
error('none of the DBMSs (' + ', '.join(dbms_dict.keys()) + ') were found, so RCDB will not be used in this build; ' + require_message)
Expand Down

0 comments on commit 4dd7efa

Please sign in to comment.