Diff of /CMakeLists.txt [1d3d0a] .. [734ba7]  Maximize  Restore

  Switch to side-by-side view

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -393,24 +393,12 @@
 	#Build HuginSetup
 	OPTION (BUILD_HUGINSETUP "Build HuginSetup (NSIS Installer)" OFF)
     IF(BUILD_HUGINSETUP)
-      FIND_PACKAGE(7ZIP REQUIRED)
-      IF(7ZIP_FOUND)
-        MESSAGE(STATUS "7ZIP found (${7ZA})")
-      ELSE(7ZIP_FOUND)
-        MESSAGE(STATUS "7ZIP not found")
-      ENDIF(7ZIP_FOUND)
       FIND_PACKAGE(NSIS REQUIRED)
       IF(NSIS_FOUND)
         MESSAGE(STATUS "NSIS found (${MAKENSIS_EXECUTABLE})")
       ELSE(NSIS_FOUND)
         MESSAGE(STATUS "NSIS not found")
       ENDIF(NSIS_FOUND)
-      IF(CMAKE_SIZEOF_VOID_P EQUAL 4) #32bit
-        ADD_CUSTOM_TARGET(HuginSetup COMMAND ${7ZA} a hugin_bin32 bin & move /Y hugin_bin32.7z ${CMAKE_INSTALL_PREFIX}/../ COMMAND ${7ZA} a hugin_share32 share & move /Y hugin_share32.7z ${CMAKE_INSTALL_PREFIX}/../ COMMAND ${7ZA} a hugin_doc doc & move /Y hugin_doc.7z ${CMAKE_INSTALL_PREFIX}/../ COMMAND cd .. & ${MAKENSIS_EXECUTABLE} HuginSetup.nsi WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})
-      ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-      IF(CMAKE_SIZEOF_VOID_P EQUAL 8) #64bit
-        ADD_CUSTOM_TARGET(HuginSetup COMMAND ${7ZA} a hugin_bin64 bin & move /Y hugin_bin64.7z ${CMAKE_INSTALL_PREFIX}/../ COMMAND ${7ZA} a hugin_share64 share & move /Y hugin_share64.7z ${CMAKE_INSTALL_PREFIX}/../ COMMAND ${7ZA} a hugin_doc doc & move /Y hugin_doc.7z ${CMAKE_INSTALL_PREFIX}/../ COMMAND cd .. & ${MAKENSIS_EXECUTABLE} HuginSetup.nsi WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})
-      ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
     ENDIF(BUILD_HUGINSETUP)
   ENDIF(WIN32)
 

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks