--- CMakeLists.txt.boost 2008-08-19 14:14:00.000000000 +0200
+++ CMakeLists.txt 2008-08-19 14:16:56.000000000 +0200
@@ -205,10 +205,10 @@
MARK_AS_ADVANCED(K3D_TEST_VBO)
# Find required external packages
-INCLUDE(K3DFindBoost)
-IF(NOT K3D_BOOST_FOUND)
+FIND_PACKAGE( Boost 1.34.1 COMPONENTS program_options python regex )
+IF(NOT Boost_FOUND)
MESSAGE(SEND_ERROR "Couldn't find the boost library")
-ENDIF(NOT K3D_BOOST_FOUND)
+ENDIF(NOT Boost_FOUND)
INCLUDE(K3DFindGlibmm)
IF(NOT K3D_GLIBMM_FOUND)
--- application/CMakeLists.txt.boost 2008-08-19 14:31:17.000000000 +0200
+++ application/CMakeLists.txt 2008-08-19 14:31:58.000000000 +0200
@@ -2,11 +2,11 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
SET(SOURCES k3d_main.cpp)
@@ -36,7 +36,7 @@
ADD_EXECUTABLE(k3d WIN32 ${SOURCES})
TARGET_LINK_LIBRARIES(k3d k3dsdk)
-TARGET_LINK_LIBRARIES(k3d ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
+TARGET_LINK_LIBRARIES(k3d ${Boost_PROGRAM_OPTIONS_LIBRARY})
IF(K3D_BUILD_NLS)
INCLUDE_DIRECTORIES(${K3D_INTL_INCLUDE_DIRS})
--- bug-buddy/CMakeLists.txt.boost 2008-08-19 14:31:17.000000000 +0200
+++ bug-buddy/CMakeLists.txt 2008-08-19 14:31:58.000000000 +0200
@@ -2,12 +2,12 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GTKMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GTKMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
@@ -18,8 +18,8 @@
ADD_EXECUTABLE(k3d-bug-buddy main.cpp)
TARGET_LINK_LIBRARIES(k3d-bug-buddy k3dsdk)
-TARGET_LINK_LIBRARIES(k3d-bug-buddy ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
-TARGET_LINK_LIBRARIES(k3d-bug-buddy ${K3D_BOOST_REGEX_LIBS})
+TARGET_LINK_LIBRARIES(k3d-bug-buddy ${Boost_PROGRAM_OPTIONS_LIBRARY})
+TARGET_LINK_LIBRARIES(k3d-bug-buddy ${Boost_REGEX_LIBRARY})
TARGET_LINK_LIBRARIES(k3d-bug-buddy ${K3D_GLIBMM_LIBS})
TARGET_LINK_LIBRARIES(k3d-bug-buddy ${K3D_GTKMM_LIBS})
--- distribution/win32/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ distribution/win32/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -54,9 +54,9 @@
ENDIF(K3D_INSTALL_AQSIS)
IF(K3D_INSTALL_BOOST)
- #INSTALL(FILES ${K3D_BOOST_LIB_DIR}/${K3D_BOOST_REGEX_LIB}.dll DESTINATION bin)
- INSTALL(FILES ${K3D_BOOST_LIB_DIR}/${K3D_BOOST_PYTHON_LIB}.dll DESTINATION bin)
- INSTALL(FILES ${K3D_BOOST_LIB_DIR}/${K3D_BOOST_PROGRAM_OPTIONS_LIB}.dll DESTINATION bin)
+ #INSTALL(FILES ${K3D_BOOST_LIB_DIR}/${Boost_REGEX_LIBRARY}.dll DESTINATION bin)
+ INSTALL(FILES ${K3D_BOOST_LIB_DIR}/${Boost_PYTHON_LIBRARY}.dll DESTINATION bin)
+ INSTALL(FILES ${K3D_BOOST_LIB_DIR}/${Boost_PROGRAM_OPTIONS_LIBRARY}.dll DESTINATION bin)
ENDIF(K3D_INSTALL_BOOST)
IF(K3D_INSTALL_GTKMM)
--- k3dsdk/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ k3dsdk/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -22,7 +22,7 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_SOURCE_DIR}/gil)
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_OPENGL_INCLUDE_DIR})
@@ -38,7 +38,7 @@
INCLUDE_DIRECTORIES(${K3D_XML_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${K3D_ZLIB_INCLUDE_DIR})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GLIBMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
--- k3dsdk/ngui/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ k3dsdk/ngui/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -12,13 +12,13 @@
INCLUDE_DIRECTORIES(${k3dsdk_SOURCE_DIR}/gil)
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GTKGLEXT_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GTKMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GTKGLEXT_LIB_DIRS})
LINK_DIRECTORIES(${K3D_GTKMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
@@ -27,8 +27,8 @@
K3D_GENERATE_DEF_FILE(k3dsdk-ngui)
TARGET_LINK_LIBRARIES(k3dsdk-ngui k3dsdk)
-TARGET_LINK_LIBRARIES(k3dsdk-ngui ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
-TARGET_LINK_LIBRARIES(k3dsdk-ngui ${K3D_BOOST_REGEX_LIBS})
+TARGET_LINK_LIBRARIES(k3dsdk-ngui ${Boost_PROGRAM_OPTIONS_LIBRARY})
+TARGET_LINK_LIBRARIES(k3dsdk-ngui ${Boost_REGEX_LIBRARY})
TARGET_LINK_LIBRARIES(k3dsdk-ngui ${K3D_GLIBMM_LIBS})
TARGET_LINK_LIBRARIES(k3dsdk-ngui ${K3D_GTKGLEXT_LIBS})
TARGET_LINK_LIBRARIES(k3dsdk-ngui ${K3D_GTKMM_LIBS})
--- k3dsdk/python/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ k3dsdk/python/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -3,12 +3,12 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_SOURCE_DIR}/gil)
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
ADD_LIBRARY(k3dsdk-python-types SHARED
@@ -50,7 +50,7 @@
K3D_GENERATE_DEF_FILE(k3dsdk-python-types)
TARGET_LINK_LIBRARIES(k3dsdk-python-types k3dsdk)
-TARGET_LINK_LIBRARIES(k3dsdk-python-types ${K3D_BOOST_PYTHON_LIBS})
+TARGET_LINK_LIBRARIES(k3dsdk-python-types ${Boost_PYTHON_LIBRARY})
TARGET_LINK_LIBRARIES(k3dsdk-python-types ${PYTHON_LIBRARIES})
IF(NOT WIN32)
--- k3dsdk/subdivision_surface/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ k3dsdk/subdivision_surface/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -5,11 +5,11 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_OPENGL_INCLUDE_DIR})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
ADD_LIBRARY(k3dsdk-subdivision-surface SHARED ${HEADERS} ${SOURCES})
--- k3dsdk/surface_polygonizer/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ k3dsdk/surface_polygonizer/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -5,11 +5,11 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_OPENGL_INCLUDE_DIR})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GLIBMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
--- k3dsdk/tests/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ k3dsdk/tests/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -2,10 +2,10 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
LINK_LIBRARIES(k3dsdk)
--- make-module-proxy/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ make-module-proxy/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -2,11 +2,11 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GLIBMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
--- modules/CMakeLists.txt.boost 2008-08-19 14:31:18.000000000 +0200
+++ modules/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -1,12 +1,12 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_SOURCE_DIR}/gil)
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_OPENGL_INCLUDE_DIR})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
LINK_LIBRARIES(k3dsdk)
--- modules/scripted_plugins/CMakeLists.txt.boost 2008-08-19 14:31:19.000000000 +0200
+++ modules/scripted_plugins/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -1,6 +1,6 @@
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
K3D_BUILD_MODULE(k3d-scripted-plugins)
-TARGET_LINK_LIBRARIES(k3d-scripted-plugins ${K3D_BOOST_REGEX_LIBS})
+TARGET_LINK_LIBRARIES(k3d-scripted-plugins ${Boost_REGEX_LIBRARY})
# We explicitly do-not create a module proxy for this module,
# since it produces a dynamic list of plugins at runtime
--- renderframe/CMakeLists.txt.boost 2008-08-19 14:31:19.000000000 +0200
+++ renderframe/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -2,11 +2,11 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GLIBMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
@@ -17,7 +17,7 @@
ADD_EXECUTABLE(k3d-renderframe main.cpp)
TARGET_LINK_LIBRARIES(k3d-renderframe k3dsdk)
-TARGET_LINK_LIBRARIES(k3d-renderframe ${K3D_BOOST_REGEX_LIBS})
+TARGET_LINK_LIBRARIES(k3d-renderframe ${Boost_REGEX_LIBRARY})
IF(WIN32 AND K3D_COMPILER_GCC)
SET_TARGET_PROPERTIES(k3d-renderframe PROPERTIES LINK_FLAGS -mwindows)
ENDIF(WIN32 AND K3D_COMPILER_GCC)
--- renderjob/CMakeLists.txt.boost 2008-08-19 14:31:19.000000000 +0200
+++ renderjob/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -2,11 +2,11 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GLIBMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
--- resource-compiler/CMakeLists.txt.boost 2008-08-19 14:31:19.000000000 +0200
+++ resource-compiler/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -1,8 +1,8 @@
PROJECT(k3d-resource-compiler)
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
ADD_EXECUTABLE(k3d-resource-compiler main.cpp)
-TARGET_LINK_LIBRARIES(k3d-resource-compiler ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
+TARGET_LINK_LIBRARIES(k3d-resource-compiler ${Boost_PROGRAM_OPTIONS_LIBRARY})
--- sl2xml/CMakeLists.txt.boost 2008-08-19 14:31:19.000000000 +0200
+++ sl2xml/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -2,10 +2,10 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GLIBMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
--- types/CMakeLists.txt.boost 2008-08-19 14:31:20.000000000 +0200
+++ types/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3d_BINARY_DIR}/k3dsdk)
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
ADD_EXECUTABLE(test-types main.cpp)
ADD_TEST(k3dsdk.types ${EXECUTABLE_OUTPUT_PATH}/test-types)
--- uimodules/ngui/CMakeLists.txt.boost 2008-08-19 14:31:20.000000000 +0200
+++ uimodules/ngui/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -2,13 +2,13 @@
INCLUDE_DIRECTORIES(${k3dsdk_SOURCE_DIR}/gil)
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GTKGLEXT_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GTKMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GTKGLEXT_LIB_DIRS})
LINK_DIRECTORIES(${K3D_GTKMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
@@ -17,8 +17,8 @@
TARGET_LINK_LIBRARIES(k3d-ngui k3dsdk)
TARGET_LINK_LIBRARIES(k3d-ngui k3dsdk-ngui)
-TARGET_LINK_LIBRARIES(k3d-ngui ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
-TARGET_LINK_LIBRARIES(k3d-ngui ${K3D_BOOST_REGEX_LIBS})
+TARGET_LINK_LIBRARIES(k3d-ngui ${Boost_PROGRAM_OPTIONS_LIBRARY})
+TARGET_LINK_LIBRARIES(k3d-ngui ${Boost_REGEX_LIBRARY})
TARGET_LINK_LIBRARIES(k3d-ngui ${K3D_GLIBMM_LIBS})
TARGET_LINK_LIBRARIES(k3d-ngui ${K3D_GTKGLEXT_LIBS})
TARGET_LINK_LIBRARIES(k3d-ngui ${K3D_GTKMM_LIBS})
--- uimodules/nui/CMakeLists.txt.boost 2008-08-19 14:31:20.000000000 +0200
+++ uimodules/nui/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -1,13 +1,13 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
K3D_BUILD_UI_MODULE(k3d-nui)
TARGET_LINK_LIBRARIES(k3d-nui k3dsdk)
-TARGET_LINK_LIBRARIES(k3d-nui ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
+TARGET_LINK_LIBRARIES(k3d-nui ${Boost_PROGRAM_OPTIONS_LIBRARY})
--- uimodules/pyui/CMakeLists.txt.boost 2008-08-19 14:31:21.000000000 +0200
+++ uimodules/pyui/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -1,16 +1,16 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
K3D_BUILD_UI_MODULE(k3d-pyui)
TARGET_LINK_LIBRARIES(k3d-pyui k3dsdk)
TARGET_LINK_LIBRARIES(k3d-pyui k3dsdk-python)
-TARGET_LINK_LIBRARIES(k3d-pyui ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
+TARGET_LINK_LIBRARIES(k3d-pyui ${Boost_PROGRAM_OPTIONS_LIBRARY})
TARGET_LINK_LIBRARIES(k3d-pyui ${PYTHON_LIBRARIES})
--- uimodules/qtui/CMakeLists.txt.boost 2008-08-19 14:31:21.000000000 +0200
+++ uimodules/qtui/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -4,21 +4,21 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${QT_INCLUDES})
QT4_WRAP_CPP(MOC_BUILT_SOURCES user_interface.h)
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
ADD_LIBRARY(k3d-qtui SHARED user_interface.h user_interface.cpp ${MOC_BUILT_SOURCES})
SET_TARGET_PROPERTIES(k3d-qtui PROPERTIES PREFIX "" SUFFIX ".module")
TARGET_LINK_LIBRARIES(k3d-qtui k3dsdk)
-TARGET_LINK_LIBRARIES(k3d-qtui ${K3D_BOOST_PROGRAM_OPTIONS_LIBS})
+TARGET_LINK_LIBRARIES(k3d-qtui ${Boost_PROGRAM_OPTIONS_LIBRARY})
TARGET_LINK_LIBRARIES(k3d-qtui ${QT_QTCORE_LIBRARY})
TARGET_LINK_LIBRARIES(k3d-qtui ${QT_QTGUI_LIBRARY})
TARGET_LINK_LIBRARIES(k3d-qtui ${QT_QTOPENGL_LIBRARY})
--- uuidgen/CMakeLists.txt.boost 2008-08-19 14:31:22.000000000 +0200
+++ uuidgen/CMakeLists.txt 2008-08-19 14:31:59.000000000 +0200
@@ -2,9 +2,9 @@
INCLUDE_DIRECTORIES(${k3d_SOURCE_DIR})
INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
-INCLUDE_DIRECTORIES(${K3D_BOOST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${K3D_BOOST_LIB_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
LINK_DIRECTORIES(${K3D_GLIBMM_LIB_DIRS})
LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
