From c82f9d9ea892df127a19fb11003b818f31dde2f2 Mon Sep 17 00:00:00 2001 From: Brandon King Date: Wed, 19 Jul 2006 00:22:57 +0000 Subject: [PATCH] Windows XP support patch by Diane --- makelib/FindBoost.cmake | 48 ++++++++++++++++++++--------------------- qui/CMakeLists.txt | 3 ++- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake index c69b394..0cd5804 100644 --- a/makelib/FindBoost.cmake +++ b/makelib/FindBoost.cmake @@ -12,30 +12,30 @@ FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp IF(MINGW) SET (BOOST_ROOT C:\\Boost) - FIND_PATH( BOOST_UNIT_TEST_LIBRARY - libboost_unit_test_framework-mgw-s.lib - ${BOOST_ROOT}\\lib ) - FIND_PATH( BOOST_UNIT_TEST_LIBRARY_DEBUG - libboost_unit_test_framework-mgw-sd.lib - PATHS ${BOOST_ROOT}\\lib ) - FIND_PATH( BOOST_PROGRAM_OPTIONS_LIBRARY - libboost_program_options-mgw-s.lib - PATHS ${BOOST_ROOT}\\lib ) - FIND_PATH( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG - libboost_program_options-sd.lib - PATHS ${BOOST_ROOT}\\lib ) - FIND_PATH( BOOST_FILESYSTEM_LIBRARY - libboost_filesystem-mgw-s.lib - PATHS ${BOOST_ROOT}\\lib ) - FIND_PATH( BOOST_FILESYSTEM_LIBRARY_DEBUG - libboost_filesystem-mgw-sd.lib - PATHS ${BOOST_ROOT}\\lib ) - FIND_PATH( BOOST_PYTHON_LIBRARY - libboost_python-mgw.lib - PATHS ${BOOST_ROOT}\\lib ) - FIND_PATH( BOOST_PYTHON_LIBRARY_DEBUG - libboost_python-mgw-d.lib - PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY + libboost_unit_test_framework-mgw-s + ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY_DEBUG + libboost_unit_test_framework-mgw-s + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY + libboost_program_options-mgw-s + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG + libboost_program_options-mgw-sd + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY + libboost_filesystem-mgw-s + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG + libboost_filesystem-mgw-sd + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_PYTHON_LIBRARY + libboost_python-mgw + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG + libboost_python-mgw-d + PATHS ${BOOST_ROOT}\\lib ) ELSE(MINGW) diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt index 64a7255..a763497 100644 --- a/qui/CMakeLists.txt +++ b/qui/CMakeLists.txt @@ -71,7 +71,8 @@ SET(SOURCES ${MOC_SOURCES} ${GUI_SOURCES} ${RCC_SOURCES} ${MAIN_SOURCES}) # these are really only needed for gcc on AMD64 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} - ${QT_INCLUDES}) + ${QT_INCLUDES} + ${BOOST_INCLUDE_DIR} ) ADD_LIBRARY(mussa_qui STATIC ${SOURCES}) TARGET_LINK_LIBRARIES(mussa_qui -- 2.30.2