Skip to content
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

fix qt4 conflict with boost #795

Open
wants to merge 1 commit into
base: production
Choose a base branch
from
Open

fix qt4 conflict with boost #795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion plugins/qtcoinrave/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ if (QT_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND SOQT_LIBRARY_FOUND AND C
qt4_wrap_cpp(MOC_OUTPUT_FILES ${QTCOIN_MOCS})

check_include_file(X11/Xlib.h HAVE_X11_XLIB_H)

if (Boost_MINOR_VERSION LESS 65)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure you don't have to test Boost MAJOR version here to be 1? For example, in the future Boost 2 might come out, then all this code will be invalid.
thanks

QT4_WRAP_CPP(MOC_OUTPUT_FILES ${QTCOIN_MOCS} OPTIONS -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) #for boost previous to 1.65.1
else(Boost_MINOR_VERSION LESS 65)
QT4_WRAP_CPP(MOC_OUTPUT_FILES ${QTCOIN_MOCS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_LEXICAL_CAST_INCLUDED -DBOOST_NEXT_PRIOR_HPP_INCLUDED -DBOOST_TYPE_TRAITS_HPP -D_SYS_SYSMACROS_H_OUTER) #for boost 1.65.1
endif(Boost_MINOR_VERSION LESS 65)

# build sources, moc'd sources, and rcc'd sources
add_library(qtcoinrave SHARED ivselector.cpp item.cpp qtcoinviewer.cpp qtcoinrave.cpp ${MOC_OUTPUT_FILES} item.h ivselector.h qtcoin.h qtcoinviewer.h qtcameraviewer.h ivmodelloader.cpp)

Expand Down