From 99b41e5d777018e17fe43249c5e78438ce2331f0 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Mon, 9 Jul 2012 00:25:37 -0400
Subject: [PATCH] link gui to boost command options on windows. Duplicate
symbol problem was solved by switching boost autlink off
---
modules/gui/src/CMakeLists.txt | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index b4d9ee6e4..190cb6f66 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -476,12 +476,8 @@ include_directories(${PYTHON_INCLUDE_PATH})
qt4_add_resources(OST_QT_RESOURCE dngr.qrc)
qt4_wrap_cpp(OST_GOSTY_MOC "gosty.hh"
OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-# if someone has ANY idea why windows already has the boost program options
-# symbols defined, please talk to Marco and Juergen. You will be rewarded with
-# dogfood for a lifetime!
-if (NOT WIN32)
- set(LINK LINK ${BOOST_PROGRAM_OPTIONS_LIBRARIES})
-endif()
+
+set(LINK LINK ${BOOST_PROGRAM_OPTIONS_LIBRARIES})
executable_libexec(NAME gosty SOURCES gosty.cc ${OST_GOSTY_MOC} ${OST_QT_RESOURCE}
DEPENDS_ON ost_gui ${LINK})
--
GitLab