Merge branch 'master' of ssh://fann.git.sourceforge.net/gitroot/fann/…

…fann

CMakeLists.txt

@@ -1,7 +1,6 @@
 PROJECT (FANN)
 #SET(CMAKE_VERBOSE_MAKEFILE ON)
-cmake_minimum_required(VERSION 2.4)
-
+cmake_minimum_required(VERSION 2.8)
 
 SET(CMAKE_MODULE_PATH
 	${CMAKE_SOURCE_DIR}/cmake/Modules 
@@ -12,7 +11,6 @@ SET(VERSION 2.2.0)
 INCLUDE(DefineInstallationPaths)
 
 
-
 configure_file( ${CMAKE_SOURCE_DIR}/cmake/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/include/config.h )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/src/include/)
 
@@ -24,6 +22,34 @@ SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig)
 
 INSTALL_FILES( ${PKGCONFIG_INSTALL_DIR} FILES  fann.pc )
 
-
 ADD_SUBDIRECTORY( src ) 
 
+################# cpack ################
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast Artificial Neural Network Library (FANN)")
+SET(CPACK_PACKAGE_VENDOR "Steffen Nissen")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt")
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_GENERATOR "TGZ;ZIP")
+SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Steffen Nissen") 
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
+IF(WIN32 AND NOT UNIX)
+  # There is a bug in NSI that does not handle full unix paths properly. Make
+  # sure there is at least one set of four (4) backlasshes.
+#  SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
+#  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\MyExecutable.exe")
+#  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} My Famous Project")
+  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\leenissen.dk/fann/")
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\leenissen.dk/fann/")
+  SET(CPACK_NSIS_CONTACT "[email protected]")
+  SET(CPACK_NSIS_MODIFY_PATH ON)
+ELSE(WIN32 AND NOT UNIX)
+#  SET(CPACK_STRIP_FILES "bin/MyExecutable")
+#  SET(CPACK_SOURCE_STRIP_FILES "")
+ENDIF(WIN32 AND NOT UNIX)
+#SET(CPACK_PACKAGE_EXECUTABLES "MyExecutable" "My Executable")
+INCLUDE(CPack)