Commits

Merov Linden committed 54fbf91 Merge

STORM-977 : pull into viewer-development

  • Participants
  • Parent commits 767feb1, 8c9a599

Comments (0)

Files changed (3)

File doc/contributions.txt

 	STORM-980
 	VWR-17801
 	VWR-24347
+	STORM-977
 Kage Pixel
 	VWR-11
 Ken March

File indra/CMakeLists.txt

   add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
 
   # llplugin testbed code (is this the right way to include it?)
-  if (NOT LINUX)
+  if (LL_TESTS AND NOT LINUX)
     add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
-  endif (NOT LINUX)
+  endif (LL_TESTS AND NOT LINUX)
 
   if (LINUX)
     add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)

File indra/test_apps/llplugintest/CMakeLists.txt

 # -*- cmake -*-
-
 project(llplugintest)
 
 include(00-Common)