mirror of
https://github.com/dgirardeau/q3DMASC.git
synced 2026-08-29 08:34:48 +08:00
Merge pull request #7 from prascle/macOSport
building plugin 3DMASC on macOS, without OpenMP
This commit is contained in:
@@ -1389,7 +1389,11 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
|
||||
{
|
||||
cancelled = true;
|
||||
success = false;
|
||||
#if defined(_OPENMP)
|
||||
errorStr = "Feature computation failed for point " + QString::number(i) + " (using OpenMP with " + QString::number(omp_get_num_threads()) + " threads)";
|
||||
#else
|
||||
errorStr = "Feature computation failed for point " + QString::number(i);
|
||||
#endif
|
||||
ccLog::Error(localErrorStr);
|
||||
}
|
||||
|
||||
@@ -1401,7 +1405,11 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
|
||||
if (cancelled)
|
||||
{
|
||||
//process cancelled by the user
|
||||
#if defined(_OPENMP)
|
||||
errorStr = "Process cancelled at point " + QString::number(i) + " (using OpenMP with " + QString::number(omp_get_num_threads()) + " threads)";
|
||||
#else
|
||||
errorStr = "Process cancelled at point " + QString::number(i);
|
||||
#endif
|
||||
ccLog::Warning(errorStr);
|
||||
success = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user