Changeset 1812 for trunk/applications

Timestamp:

06/02/12 10:13:26 (4 months ago)

Author:

Freddie Akeroyd

Message:

• Create proper nxconfig.h from CMake
• Build NXvalidate in CMake

Refs #327

Location:

trunk/applications

Files:

• CMakeLists.txt (modified) (2 diffs)
• NXvalidate/CMakeLists.txt (modified) (2 diffs)

trunk/applications/CMakeLists.txt

@@ -30 +30 @@
 find_package(LibXml2)
 
-#Find the java runtime and sdk
-find_package(Java 1.6)
-
 # Recurse into the subdirectories.
 
@@ -43 +40 @@
 endif()
 
-if (HAVE_XML)
+if (HAVE_MXML)
 add_subdirectory (nxingest)
-endif(HAVE_XML)
+endif(HAVE_MXML)
 
 add_subdirectory (NXtraverse)
 
-if(Java_FOUND AND ANTEXEC_FOUND)
+if(Java_JAVAC_EXECUTABLE AND ANT_FOUND)
     add_subdirectory (NXvalidate)
-endif(Java_FOUND AND ANTEXEC_FOUND)
+endif(Java_JAVAC_EXECUTABLE AND ANT_FOUND)
 
 if(LIBXML2_FOUND)

trunk/applications/NXvalidate/CMakeLists.txt

@@ -27 +27 @@
 #====================================================================
 
-configure_file(nxvalidate.in nxvalidate)
+configure_file(nxvalidate.in nxvalidate @ONLY)
 
-execute_process(COMMAND ${ANT})
+add_custom_target(NXvalidate ALL COMMAND ${ANT_EXEC} DEPENDS build.xml nbproject)
 
-install (TARGETS nxvalidate DESTINATION bin)
+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_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 (FILES nxvalidate DESTINATION bin)
+
 install (DIRECTORY dist/javadoc DESTINATION ${NXDOCDIR}/java/nxvalidate
          FILE_PERMISSIONS
@@ -42 +49 @@
             WORLD_READ WORLD_EXECUTE)
 
-install (LIBRARY dist/NXvalidate.jar lib/jhall.jar lib/saxon9he.jar DESTINATION lib/lib COMPONENT Runtime)
-install (LIBRARY dist/NXvalidate.jar DESTINATION lib COMPONENT Development)
+install (FILES dist/NXvalidate.jar lib/jhall.jar lib/saxon9he.jar DESTINATION lib/lib COMPONENT Runtime)
+
+install (FILES dist/NXvalidate.jar DESTINATION lib COMPONENT Development)