Linking debug nexus libraries. Re #6527.

mantidproject · Feb 21, 2013 · e130135 · e130135
1 parent adf924d
commit e130135
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/Code/Mantid/Build/CMake/FindNexus.cmake b/Code/Mantid/Build/CMake/FindNexus.cmake
@@ -16,12 +16,26 @@ if( NOT NEXUS_INCLUDE_DIR )
   # The old path
   find_path ( NEXUS_INCLUDE_DIR napi.h )
 endif()
-	  
+
 # Find the C libraries
 find_library ( NEXUS_C_LIBRARIES NAMES NeXus libNeXus-0 )
 # Find the C++ libraries
 find_library ( NEXUS_CPP_LIBRARIES NAMES NeXusCPP libNeXusCPP-0)
-set ( NEXUS_LIBRARIES ${NEXUS_C_LIBRARIES} ${NEXUS_CPP_LIBRARIES} )
+
+# Debug variants
+# C
+find_library ( NEXUS_C_LIBRARIES_DEBUG NAMES NeXus libNeXus-0D )
+# C++
+find_library ( NEXUS_CPP_LIBRARIES_DEBUG NAMES NeXusCPP libNeXusCPP-0D)
+
+if ( NEXUS_C_LIBRARIES_DEBUG AND NEXUS_CPP_LIBRARIES_DEBUG )
+  set ( NEXUS_LIBRARIES optimized ${NEXUS_C_LIBRARIES} 
+                        optimized ${NEXUS_CPP_LIBRARIES} 
+                        debug ${NEXUS_C_LIBRARIES_DEBUG} 
+                        debug ${NEXUS_CPP_LIBRARIES_DEBUG} )
+else()
+  set ( NEXUS_LIBRARIES ${NEXUS_C_LIBRARIES} ${NEXUS_CPP_LIBRARIES} )
+endif()
 
 # Set a version string by examining the napi.h header
 if( NEXUS_INCLUDE_DIR )