Merge pull request #309 from allywarner/Seg3DLib_build_script

Seg3dlib build script

Author: allywarner

Superbuild/Superbuild.cmake

@@ -303,7 +303,7 @@ SET(SEG3D_CACHE_ARGS
     "-DSEG3D_SHOW_CONSOLE:BOOL=${SEG3D_SHOW_CONSOLE}"
     "-DBUILD_WITH_PYTHON:BOOL=${BUILD_WITH_PYTHON}"
     "-DBUILD_STANDALONE_LIBRARY:BOOL=${BUILD_STANDALONE_LIBRARY}"
-    "-DSEG3D_MANUAL_TOOLS_ONLY:BOOL=${SEG3D_MANUAL_TOOLS_ONLY}"
+    "-DBUILD_MANUAL_TOOLS_ONLY:BOOL=${BUILD_MANUAL_TOOLS_ONLY}"
     "-DDO_ZLIB_MANGLE:BOOL=${DO_ZLIB_MANGLE}"
     "-DSUPERBUILD_LIBS_SOURCE_DIR:PATH=${SUPERBUILD_LIBS_SOURCE_DIR}"
     "-DZlib_DIR:PATH=${Zlib_DIR}"

src/Application/Tool/ToolFactory.cc

@@ -95,7 +95,7 @@ ToolFactory::~ToolFactory()
 {
 }
 
-#ifdef SEG3D_MANUAL_TOOLS_ONLY
+#ifdef BUILD_MANUAL_TOOLS_ONLY
 static std::set<std::string> nonManualTools = { "croptool", "resampletool", "thresholdtool", "cannyedgedetectionfilter",
 "confidenceconnectedfilter", "connectedcomponentfilter", "curvatureanisotropicdiffusionfilter",
 "discretegaussianfilter", "distancefilter", "extractdatalayer", "gradientanisotropicdiffusionfilter",
@@ -110,7 +110,7 @@ void ToolFactory::register_tool(ToolBuilderBase* builder, ToolInfoHandle info,
 {
   tool_name = Core::StringToLower(tool_name);
 
-#ifdef SEG3D_MANUAL_TOOLS_ONLY
+#ifdef BUILD_MANUAL_TOOLS_ONLY
  //When building a library, we don't want to include the tools in nonManualTools
     if (nonManualTools.find(tool_name) != nonManualTools.end())
     {

src/CMakeLists.txt

@@ -149,8 +149,8 @@ IF(BUILD_STANDALONE_LIBRARY)
   ADD_DEFINITIONS(-DBUILD_STANDALONE_LIBRARY)
 ENDIF()
 
-IF(SEG3D_MANUAL_TOOLS_ONLY)
-  ADD_DEFINITIONS(-DSEG3D_MANUAL_TOOLS_ONLY)
+IF(BUILD_MANUAL_TOOLS_ONLY)
+  ADD_DEFINITIONS(-DBUILD_MANUAL_TOOLS_ONLY)
 ENDIF()
 
 ###########################################

src/Interface/Application/Menu.cc

@@ -103,7 +103,7 @@ Menu::Menu( QMainWindow* parent ) :
     this->update_undo_tag( UndoBuffer::Instance()->get_undo_tag() );
     this->update_redo_tag( UndoBuffer::Instance()->get_redo_tag() );
 
-#ifndef SEG3D_MANUAL_TOOLS_ONLY
+#ifndef BUILD_MANUAL_TOOLS_ONLY
     // Update to the most recent list
     this->set_recent_file_list(); 
 #endif
@@ -170,7 +170,7 @@ void Menu::create_file_menu( QMenuBar* menubar )
   // == New Project ==
   QAction* qaction;
 
-#ifndef SEG3D_MANUAL_TOOLS_ONLY
+#ifndef BUILD_MANUAL_TOOLS_ONLY
   {
     Core::StateEngine::lock_type lock( Core::StateEngine::GetMutex() );
     bool project_creation = InterfaceManager::Instance()->enable_project_creation_state_->get();
@@ -284,7 +284,7 @@ void Menu::create_file_menu( QMenuBar* menubar )
     boost::bind( &LayerIOFunctions::ExportLayer, this->main_window_ ) );
   this->export_active_data_layer_qaction_->setEnabled( false );
 
-#ifndef SEG3D_MANUAL_TOOLS_ONLY
+#ifndef BUILD_MANUAL_TOOLS_ONLY
   qmenu->addSeparator();
 
   // == Recent Projects ==
@@ -882,7 +882,7 @@ void Menu::open_project_folder()
 
 void Menu::set_recent_file_list()
 {
-#ifndef SEG3D_MANUAL_TOOLS_ONLY
+#ifndef BUILD_MANUAL_TOOLS_ONLY
   QAction* qaction = 0;
   this->file_menu_recents_->clear();
 
@@ -1012,7 +1012,7 @@ void Menu::mac_open_another_version()
 
 void Menu::SetRecentFileList( qpointer_type qpointer )
 {
-#ifndef SEG3D_MANUAL_TOOLS_ONLY
+#ifndef BUILD_MANUAL_TOOLS_ONLY
   Core::Interface::PostEvent( QtUtils::CheckQtPointer( qpointer, boost::bind(
     &Menu::set_recent_file_list, qpointer.data() ) ) );
 #endif

src/Main/CMakeLists.txt

@@ -44,32 +44,32 @@ SET(MAIN_SRCS
 # Build the Seg3D executable
 ###########################################
 
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SEG3D_BINARY_DIR})
-ADD_DEFINITIONS(-DAPPLICATION_NAME=${APPLICATION_NAME})
-
-IF(APPLE)
-  LIST(APPEND MAIN_SRCS ${APPLICATION_OSX_ICON_FULL_PATH})
-  SET_SOURCE_FILES_PROPERTIES(${APPLICATION_OSX_ICON_FULL_PATH}
-    PROPERTIES
-  MACOSX_PACKAGE_LOCATION Resources)
-  ADD_EXECUTABLE(${APPLICATION_NAME} MACOSX_BUNDLE ${MAIN_SRCS})
-  SET_TARGET_PROPERTIES(${APPLICATION_NAME}
-    PROPERTIES
-    MACOSX_BUNDLE_INFO_PLIST ${SEG3D_SOURCE_DIR}/Resources/info.plist
-    MACOSX_BUNDLE_ICON_FILE ${APPLICATION_OSX_ICON}
-  )
-ELSE()
-  IF(WIN32)
-    LIST(APPEND MAIN_SRCS ${APPLICATION_WINDOWS_RC})
-    IF(SEG3D_SHOW_CONSOLE)
-      ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
+IF(NOT BUILD_STANDALONE_LIBRARY)
+  SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SEG3D_BINARY_DIR})
+  ADD_DEFINITIONS(-DAPPLICATION_NAME=${APPLICATION_NAME})
+  IF(APPLE)
+    LIST(APPEND MAIN_SRCS ${APPLICATION_OSX_ICON_FULL_PATH})
+    SET_SOURCE_FILES_PROPERTIES(${APPLICATION_OSX_ICON_FULL_PATH}
+      PROPERTIES
+    MACOSX_PACKAGE_LOCATION Resources)
+    ADD_EXECUTABLE(${APPLICATION_NAME} MACOSX_BUNDLE ${MAIN_SRCS})
+    SET_TARGET_PROPERTIES(${APPLICATION_NAME}
+      PROPERTIES
+      MACOSX_BUNDLE_INFO_PLIST ${SEG3D_SOURCE_DIR}/Resources/info.plist
+      MACOSX_BUNDLE_ICON_FILE ${APPLICATION_OSX_ICON}
+    )
+  ELSE()
+    IF(WIN32)
+      LIST(APPEND MAIN_SRCS ${APPLICATION_WINDOWS_RC})
+      IF(SEG3D_SHOW_CONSOLE)
+        ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
+      ELSE()
+        ADD_EXECUTABLE(${APPLICATION_NAME} WIN32 ${MAIN_SRCS})
+      ENDIF()
     ELSE()
-      ADD_EXECUTABLE(${APPLICATION_NAME} WIN32 ${MAIN_SRCS})
+      ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
     ENDIF()
-  ELSE()
-    ADD_EXECUTABLE(${APPLICATION_NAME} ${MAIN_SRCS})
   ENDIF()
-ENDIF()
 
 TARGET_LINK_LIBRARIES(${APPLICATION_NAME}
   ${SCI_BOOST_LIBRARY}
@@ -271,6 +271,7 @@ ELSE()
 #    ENDIF()
   ENDIF()
 ENDIF()
+ENDIF()
 
 IF(BUILD_STANDALONE_LIBRARY)
   ADD_SUBDIRECTORY(Seg3DLib)