Changeset 1794 for trunk/third_party

Timestamp:

14/12/11 16:06:02 (5 months ago)

Author:

Freddie Akeroyd

Message:

Windows CMake updates. Refs #281

Location:

trunk/third_party

Files:

• CMakeLists.txt (modified) (1 diff)
• mxml-2.6/CMakeLists.txt (modified) (2 diffs)

trunk/third_party/CMakeLists.txt

@@ -28 +28 @@
 
 add_subdirectory (tclap)
+if(HAVE_XML)
 add_subdirectory (mxml-2.6)
+endif(HAVE_XML)

trunk/third_party/mxml-2.6/CMakeLists.txt

@@ -26 +26 @@
 #
 #====================================================================
-include(FindAllIncludes.cmake)
+#include(FindAllIncludes.cmake)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -65 +65 @@
 target_link_libraries(mxmldoc MXML_Static_Library ${PTHREAD_LINK})
 
+install (TARGETS MXML_Shared_Library MXML_Static_Library
+         RUNTIME DESTINATION bin COMPONENT Runtime
+         LIBRARY DESTINATION lib COMPONENT Runtime
+         ARCHIVE DESTINATION lib/nexus COMPONENT Development)
 
+install_pdb (MXML_Shared_Library)
+