Changeset 1726 for trunk

Timestamp:

01/11/11 16:17:57 (7 months ago)

Author:

Freddie Akeroyd

Message:

Include cpack at end. Refs #281

File:

• trunk/CMakeLists.txt (modified) (4 diffs)

trunk/CMakeLists.txt

@@ -30 +30 @@
 # refer to the root source directory of the project as ${NeXus_SOURCE_DIR} and
 # to the root binary directory of the project as ${NeXus_BINARY_DIR}.
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8.4)
 
 #The name of our project
@@ -89 +89 @@
 include(cmake_include/FindSZIP.cmake)
 include(cmake_include/FindAnt.cmake)
-include(cmake_include/nexus_package_details.cmake)
 
 #Find the libraries for the build.
@@ -255 +254 @@
 #add_subdirectory (Windows_extra)
 
-# this must always be last
+# CPack must always be last
 set(CPACK_BINARY_NSIS ON)
 set(CPACK_BINARY_ZIP OFF)
@@ -262 +261 @@
           "nexus_spec.in;~$;/.svn/;/.cvsignore/;/CMakeFiles/;/nbproject/;autogen.sh;cmake_install.cmake;Makefile;${CPACK_SOURCE_IGNORE_FILES}") 
 
-include(CPack)
+include(cmake_include/nexus_package_details.cmake)