Skip to content

Works on Mac OS X 10.5 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Works on Mac OS X 10.5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29221fd
Add .gitignore
Dec 29, 2011
d789ac4
Works with gcc 4.0.0 (Mac 10.5)
Dec 29, 2011
8517fe2
Temporarily commented (wrong address)
Dec 29, 2011
6a5eabc
fix compilation error on Mac 10.5
Dec 29, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*~
build/
Build/
BUILD/
CMakeLists.txt.user*
3 changes: 2 additions & 1 deletion Base/Testing/Cpp/voDataObjectTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ bool checkDataObjectType(const voDataObject& dataObject, const char* typeName)
return false;
}

if (!dataObject.data().canConvert<TYPE>())
QVariant temp = dataObject.data();
if (!temp.canConvert<TYPE>())
{
std::cerr << "Line " << __LINE__ << " - Problem with voDataObject::data()" << std::endl;
return false;
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}.")
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

#-----------------------------------------------------------------------------
Expand Down