Diff of /CMakeLists.txt [5ad5eb] .. [ba385c] Maximize Restore

  Switch to side-by-side view

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@
 project(hugin)
 
 # version
-set(V_MAJOR 2009)
-set(V_MINOR 4)
+set(V_MAJOR 2010)
+set(V_MINOR 0)
 set(V_PATCH 0)
 
 #
@@ -206,7 +206,7 @@
   if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") 
     set(BOOST_ROOT $ENV{BOOST_ROOT}) 
   else(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") 
-    set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost_1_39_0) 
+    set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost_1_41_0) 
    endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") 
 ENDIF(WIN32)
 FIND_PACKAGE(Boost COMPONENTS thread)
@@ -431,6 +431,7 @@
 "/tools/align_image_stack$"
 "/tools/tca_correct$"
 "/tools/pto2mk$"
+"/tools/hugin_hdrmerge$"
 "/ptbatcher/PTBatcher$"
 "/ptbatcher/PTBatcherGUI$"
 "/hugin_base/test/open_file$"
@@ -441,7 +442,7 @@
 "/lens_calibrate/calibrate_lens$"
 "/nona_gui/nona_gui$"
 "/stitch_project/hugin_stitch_project$"
-"/deghosting/hugin_hdrmerge$" 
+"/deghosting/deghosting_mask$" 
 "/build/"
 "/CVS/"
 "/cmake_install.cmake$"