Upgrade iRODS to 4.2.10 (WIP) [DHS-1726]

MaastrichtUniversity · Aug 6, 2021 · caf80dd · caf80dd
1 parent 0dbc3c2
commit caf80dd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMakeModules")
 # Set some paths for dependencies from irods-externals
 set(BOOST_ROOT "/opt/irods-externals/boost1.67.0-0")
 set(IRODS_EXTERNALS_FULLPATH_CLANG /opt/irods-externals/clang6.0-0)
-set(JANSSON_ROOT /opt/irods-externals/jansson2.7-0)
 
 # Set compiler options
 add_compile_options(-std=c++14

diff --git a/msiput_dataobj_or_coll/libmsiput_dataobj_or_coll.cpp b/msiput_dataobj_or_coll/libmsiput_dataobj_or_coll.cpp
@@ -3,7 +3,6 @@
 #include "collCreate.h"
 #include "dataObjPut.h"
 #include "collection.hpp"
-#include "rcMisc.h"
 
 #include "boost/filesystem/operations.hpp"
 #include "boost/filesystem/path.hpp"
@@ -337,4 +336,4 @@ irods::ms_table_entry* plugin_factory() {
  // =-=-=-=-=-=-=-
  // 5. return the newly created microservice plugin
  return msvc;
-}
+}