Changeset 1816

Timestamp:

07/02/12 15:29:41 (4 months ago)

Author:

Freddie Akeroyd

Message:

More mods for NXvalidate building. Refs #327

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• CPackOptions.cmake.in (modified) (2 diffs)
• applications/NXvalidate/CMakeLists.txt (modified) (3 diffs)
• bindings/cpp/CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

trunk/CMakeLists.txt

@@ -294 +294 @@
                                 @ONLY)
 set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIRECTORY}CPackOptions.cmake")
-set (CPACK_GENERATOR TGZ;ZIP)
+set (CPACK_GENERATOR TGZ) # not use ZIP on UNIX as problem with symlinks
 if(UNIX)
     set (CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
@@ -300 +300 @@
 endif(UNIX)
 if(WIN32)
-    set (CPACK_GENERATOR ${CPACK_GENERATOR};NSIS)
+    set (CPACK_GENERATOR ${CPACK_GENERATOR};ZIP;NSIS)
 endif(WIN32)
 if(APPLE)

trunk/CPackOptions.cmake.in

@@ -4 +4 @@
 set (CPACK_PACKAGE_VERSION_MINOR "3")
 set (CPACK_PACKAGE_VERSION_PATCH "0")
+set (CPACK_PACKAGE_CONTACT "nexus-tech@nexusformat.org")
 #set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/cmake_include/nexus_description.txt")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeXus - a common format for neutron and X-ray scattering data http://www.nexusformat.org/")
@@ -44 +45 @@
 set (CPACK_RPM_PACKAGE_REQUIRES "python >= 2.5.0, cmake >= 2.8")
 
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
+
 #cpack_add_component(Runtime
 #                    DISPLAY_NAME "Binary Applications"

trunk/applications/NXvalidate/CMakeLists.txt

@@ -1 @@
-## Process this file with cmake
+## Process this file with cmake
 #====================================================================
 #  NeXus - Neutron & X-ray Common Data Format
@@ -29 +29 @@
 configure_file(nxvalidate.in nxvalidate @ONLY)
 
-add_custom_target(NXvalidate ALL COMMAND ${ANT_EXEC} DEPENDS build.xml nbproject)
+if ( NOT (${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) )
+    add_custom_command(OUTPUT build.xml COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/build.xml . COMMENT "Creating build.xml")
+    add_custom_command(OUTPUT nbproject COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/nbproject nbproject COMMENT "Creating nbproject")
+    set_property(DIRECTORY . APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES build.xml nbproject)
+endif()
 
-add_custom_command(OUTPUT build.xml COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/build.xml build.xml COMMENT "Creating build.xml")
+add_custom_target(NXvalidate ALL COMMAND ${ANT_EXEC} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build.xml ${CMAKE_CURRENT_BINARY_DIR}/nbproject)
 
-add_custom_command(OUTPUT nbproject COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/nbproject nbproject COMMENT "Creating nbproject")
 
-set_property(DIRECTORY . APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES build.xml nbproject)
+install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/nxvalidate DESTINATION bin)
 
-install (FILES nxvalidate DESTINATION bin)
-
-install (DIRECTORY dist/javadoc DESTINATION ${NXDOCDIR}/java/nxvalidate
+if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/dist/javadoc)
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dist/javadoc DESTINATION ${NXDOCDIR}/java/nxvalidate
          FILE_PERMISSIONS
             OWNER_READ OWNER_EXECUTE OWNER_WRITE
@@ -48 +50 @@
             GROUP_READ GROUP_EXECUTE 
             WORLD_READ WORLD_EXECUTE)
+endif()
 
-install (FILES dist/NXvalidate.jar lib/jhall.jar lib/saxon9he.jar DESTINATION lib/lib COMPONENT Runtime)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/dist/NXvalidate.jar lib/jhall.jar lib/saxon9he.jar DESTINATION share/java/lib COMPONENT Runtime)
 
-install (FILES dist/NXvalidate.jar DESTINATION lib COMPONENT Development)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/dist/NXvalidate.jar DESTINATION share/java COMPONENT Development)
 
 

trunk/bindings/cpp/CMakeLists.txt

@@ -63 +63 @@
          ARCHIVE DESTINATION lib/nexus COMPONENT Development)
 
+if(WIN32)
 install_pdb (NeXus_CPP_Shared_Library)
+endif()
 
 

trunk/src/CMakeLists.txt

@@ -127 +127 @@
          ARCHIVE DESTINATION lib/nexus COMPONENT Development)
 
+if(WIN32)
 install_pdb (NeXus_Shared_Library)
+endif()