From 04aaebb6e47d7e3d965864d0da6bb36d7c2aa276 Mon Sep 17 00:00:00 2001 From: Samarth Brahmbhatt Date: Thu, 19 Nov 2020 14:21:48 -0800 Subject: [PATCH] fix for Qt 4.8.7 <-> Boost conflict removed frivolous newline --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7215a1e..3d04fe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,6 +174,13 @@ set(MOCS qt4_wrap_cpp(GENERATED_SOURCES ${MOCS}) +if (Boost_MINOR_VERSION LESS 65) + QT4_WRAP_CPP(GENERATED_SOURCES ${MOCS} OPTIONS -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) #for boost previous to 1.65.1 +else(Boost_MINOR_VERSION LESS 65) + QT4_WRAP_CPP(GENERATED_SOURCES ${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) + + ## Declare a C++ library # add_library(graspit_interface # src/${PROJECT_NAME}/graspit_interface.cpp