Merge remote-tracking branch 'upstream/master'

Author: jessdtate

Superbuild/Superbuild.cmake

@@ -165,8 +165,6 @@ SET(SCIRUN_CACHE_ARGS
     "-DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}"
     "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
     "-DSCIRUN_BINARY_DIR:PATH=${SCIRUN_BINARY_DIR}"
-    "-DBUILD_LARGE_VOLUME_TOOLS:BOOL=${BUILD_LARGE_VOLUME_TOOLS}"
-    "-DBUILD_MOSAIC_TOOLS:BOOL=${BUILD_MOSAIC_TOOLS}"
     "-DSCIRUN_BITS:STRING=${SCIRUN_BITS}"
     "-DBUILD_TESTING:BOOL=${BUILD_TESTING}"
     "-DBUILD_DOCUMENTATION:BOOL=${BUILD_DOCUMENTATION}"

src/CMakeLists.txt

@@ -405,7 +405,8 @@ MESSAGE(STATUS "Configuring CPMs")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # CPM Setup.
-set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/Externals/cpm-packages" CACHE TYPE STRING)
+#set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/Externals/cpm-packages" CACHE TYPE STRING)
+set(CPM_DIR "${CMAKE_CURRENT_BINARY_DIR}/cpm-packages" CACHE TYPE STRING)
 find_package(Git)
 if(NOT GIT_FOUND)
   message(FATAL_ERROR "CPM requires Git.")

src/Externals/libxml2/CMakeLists.txt

@@ -359,7 +359,7 @@ SET(SCI_LIBXML2_INCLUDE
    )
 
 INCLUDE_DIRECTORIES( ${SCI_LIBXML2_INCLUDE} )
-ADD_LIBRARY(${SCI_LIBXML2_LIBRARY} ${LIBXML2_SRCS})
+SCIRUN_ADD_LIBRARY(${SCI_LIBXML2_LIBRARY} ${LIBXML2_SRCS})
 
 IF(UNIX)
   TARGET_LINK_LIBRARIES(
@@ -368,28 +368,6 @@ IF(UNIX)
                        )
 ENDIF(UNIX)
 
-# IF(WIN32)
-  # # Windows socket 2 library
-  # FIND_LIBRARY(WS2_LIBRARY ws2_32 PATHS ${MS_SDK_REG_PATH})
-  # TARGET_LINK_LIBRARIES(
-                         # ${SCI_LIBXML2_LIBRARY}
-                         # ${WS2_LIBRARY}
-                       # )
-
-  # SET_TARGET_PROPERTIES(${SCI_LIBXML2_LIBRARY}
-                        # PROPERTIES
-                        # DEFINE_SYMBOL _MBCS
-                       # )
-
-  # IF(BUILD_SHARED_LIBS)
-    # SET_TARGET_PROPERTIES(${SCI_LIBXML2_LIBRARY}
-                          # PROPERTIES
-                          # DEFINE_SYMBOL _USRDLL
-                          # DEFINE_SYMBOL _WINDLL
-                       # )
-  # ENDIF(BUILD_SHARED_LIBS)
-# ENDIF(WIN32)
-
 IF(ENABLE_PIC)
   SET_TARGET_PROPERTIES(${SCI_LIBXML2_LIBRARY}
                         PROPERTIES

src/Interface/Application/SCIRunMainWindow.cc

@@ -1067,10 +1067,13 @@ namespace {
     return SCIRunMainWindow::Instance()->newInterface() ? Qt::green : Qt::darkGreen;
   }
 
+  const QString bullet = "* ";
+  const QString favoritesText = bullet + "Favorites";
+
   void addFavoriteMenu(QTreeWidget* tree)
   {
     auto faves = new QTreeWidgetItem();
-    faves->setText(0, "Favorites");
+    faves->setText(0, favoritesText);
     faves->setForeground(0, favesColor());
 
     tree->addTopLevelItem(faves);
@@ -1081,7 +1084,7 @@ namespace {
     for (int i = 0; i < tree->topLevelItemCount(); ++i)
     {
       auto top = tree->topLevelItem(i);
-      if (top->text(0) == "Favorites")
+      if (top->text(0) == favoritesText)
       {
         return top;
       }
@@ -1116,7 +1119,7 @@ namespace {
   void addSnippetMenu(QTreeWidget* tree)
 	{
 		auto snips = new QTreeWidgetItem();
-		snips->setText(0, "Snippets");
+    snips->setText(0, bullet + "Snippets");
 		snips->setForeground(0, favesColor());
 
 		//hard-code a few popular ones.