diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..747c231 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*~ +build/ +Build/ +BUILD/ +CMakeLists.txt.user* diff --git a/Base/Testing/Cpp/voDataObjectTest.cpp b/Base/Testing/Cpp/voDataObjectTest.cpp index 871dbfa..c7fe6bd 100644 --- a/Base/Testing/Cpp/voDataObjectTest.cpp +++ b/Base/Testing/Cpp/voDataObjectTest.cpp @@ -79,7 +79,8 @@ bool checkDataObjectType(const voDataObject& dataObject, const char* typeName) return false; } - if (!dataObject.data().canConvert()) + QVariant temp = dataObject.data(); + if (!temp.canConvert()) { std::cerr << "Line " << __LINE__ << " - Problem with voDataObject::data()" << std::endl; return false; diff --git a/CMakeLists.txt b/CMakeLists.txt index 187589f..66b3558 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,7 @@ OPTION(WITH_COVERAGE "Enable/Disable coverage" OFF) # Check compiler version # IF(CMAKE_COMPILER_IS_GNUCXX) - SET(REQUIRED_GNUCXX_VERSION "4.2.0") + SET(REQUIRED_GNUCXX_VERSION "4.0.0") ctkFunctionGetGccVersion(${CMAKE_CXX_COMPILER} GCC_VERSION) IF(${GCC_VERSION} VERSION_LESS ${REQUIRED_GNUCXX_VERSION}) MESSAGE(FATAL_ERROR "Gcc >= ${REQUIRED_GNUCXX_VERSION} is required ! Your current version is ${GCC_VERSION}.") diff --git a/SuperBuild.cmake b/SuperBuild.cmake index aea4e37..a54b10a 100644 --- a/SuperBuild.cmake +++ b/SuperBuild.cmake @@ -65,7 +65,7 @@ endif() include(CMakeExternals/VTK.cmake) include(CMakeExternals/QtPropertyBrowser.cmake) -include(CMakeExternals/VisomicsData.cmake) +#include(CMakeExternals/VisomicsData.cmake) #include(CMakeExternals/CTK.cmake) #-----------------------------------------------------------------------------