Added PCL_IO_ENABLE_MAND_LOCKING cmake flag. (#2315)

Add PCL_IO_ENABLE_MAND_LOCKING cmake option
PointCloudLibrary · May 23, 2018 · a4e4692 · a4e4692
1 parent d1c9870
commit a4e4692
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
@@ -12,6 +12,14 @@ endif(WIN32)
 
 PCL_ADD_DOC("${SUBSYS_NAME}")
 
+if(NOT WIN32)
+  option(PCL_IO_ENABLE_MAND_LOCKING "Enables the use of mandatory locking on filesystems mounted using the mand option." ON)
+  mark_as_advanced(PCL_IO_ENABLE_MAND_LOCKING)
+  if (NOT PCL_IO_ENABLE_MAND_LOCKING)
+    add_definitions(-DNO_MANDATORY_LOCKING)
+  endif(PCL_IO_ENABLE_MAND_LOCKING)
+endif(NOT WIN32)
+
 if(build)
     if(WITH_OPENNI2)
         set(IMAGE_INCLUDES

diff --git a/io/src/pcd_io.cpp b/io/src/pcd_io.cpp
@@ -72,6 +72,7 @@ pcl::PCDWriter::setLockingPermissions (const std::string &file_name,
   (void)file_name;
   (void)lock;
 #ifndef WIN32
+#ifndef NO_MANDATORY_LOCKING
   // Boost version 1.49 introduced permissions
 #if BOOST_VERSION >= 104900
   // Attempt to lock the file. 
@@ -93,6 +94,7 @@ pcl::PCDWriter::setLockingPermissions (const std::string &file_name,
   }
 #endif
 #endif
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -103,6 +105,7 @@ pcl::PCDWriter::resetLockingPermissions (const std::string &file_name,
   (void)file_name;
   (void)lock;
 #ifndef WIN32
+#ifndef NO_MANDATORY_LOCKING
   // Boost version 1.49 introduced permissions
 #if BOOST_VERSION >= 104900
   (void)file_name;
@@ -118,6 +121,7 @@ pcl::PCDWriter::resetLockingPermissions (const std::string &file_name,
   lock.unlock ();
 #endif
 #endif
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////