Diff of /CMakeLists.txt [cf32c5] .. [88aafc] Maximize Restore

  Switch to side-by-side view

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,18 +8,6 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules )
 
-if(UNIX)
-  FIND_PROGRAM(DPKG_ARCHITECTURE_EXECUTABLE dpkg-architecture)
-  if(DPKG_ARCHITECTURE_EXECUTABLE)
-    EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE)
-  endif()
-endif()
-if(ARCH_TRIPLET)
-  set(SYSTEM_LIB_DIRS /usr/lib /usr/lib/${ARCH_TRIPLET} /usr/local/lib)
-else()
-  set(SYSTEM_LIB_DIRS /usr/lib /usr/local/lib)
-endif()
-
 include(HuginMacros)
 include(CheckIncludeFiles)
 
@@ -28,7 +16,7 @@
 
 # version
 set(V_MAJOR 2011)
-set(V_MINOR 1)
+set(V_MINOR 0)
 set(V_PATCH 0)
 
 #
@@ -72,7 +60,7 @@
 IF (EXISTS ${PROJECT_SOURCE_DIR}/.hg)
   IF (UPDATE_CHANGELOG)
    FIND_PROGRAM(_hg hg)
-   EXECUTE_PROCESS(COMMAND ${_hg} log --follow --style ${PROJECT_SOURCE_DIR}/Changelog.style
+   EXECUTE_PROCESS(COMMAND ${_hg} log --follow --style=changelog
    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
    OUTPUT_FILE ${PROJECT_SOURCE_DIR}/ChangeLog)
    MESSAGE("-- New ChangeLog generated")
@@ -273,8 +261,6 @@
   MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})")
 ENDIF(MSGFMT_FOUND)
 
-FIND_PACKAGE(ZThread)
-
 IF(WIN32)
   # HTML Helpworkshop for creating help file
   FIND_PACKAGE(HTMLHelp)
@@ -282,22 +268,6 @@
     MESSAGE(FATAL_ERROR "MS HTML Help Workshop not found. It is required to build Hugins help file.")
   ENDIF()
 ENDIF(WIN32)
-
-FIND_PACKAGE(Tclap)
-IF(NOT TCLAP_FOUND)
-  MESSAGE(FATAL_ERROR "Tclap library not found")
-ENDIF(NOT TCLAP_FOUND)
-
-OPTION(BUILD_HSI "Python Scripting Interface" OFF)
-IF(BUILD_HSI)
-  find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)
-  FIND_PACKAGE(SWIG REQUIRED)
-  INCLUDE(${SWIG_USE_FILE})
-
-  FIND_PACKAGE(PythonLibs REQUIRED)
-  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
-  ADD_DEFINITIONS(-DHUGIN_HSI)
-ENDIF()
 
 ##
 ## LAPACK (optional, enable by -DENABLE_LAPACK=ON)
@@ -508,7 +478,7 @@
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "${V_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${V_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}.${CPACK_PACKAGE_VERSION_PATCH}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${V_MAJOR}.${V_MINOR}")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "hugin-${V_MAJOR}.${V_MINOR}.${V_PATCH}")
 SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")