Commit 3417230d authored by John Tourtellott's avatar John Tourtellott
Browse files

Add/update cmake and source files to build examples from new directory

parent bc9536d3
......@@ -84,3 +84,7 @@ endif()
if (ENABLE_TESTING)
add_subdirectory(testing)
endif()
if (BUILD_EXAMPLES)
add_subdirectory(examples)
endif()
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
# Add cumuusJobTracker executable
# add_executable(cumulusJobTracker
# jobTracker.cxx
# qtJobTrackerTestWidget.cxx
# qtJobTrackerTestWidget.h
# qtJobTrackerTestWidget.ui
# )
# target_link_libraries(cumulusJobTracker
# smtkACE3PQtExt
# smtkCumulus
# smtkNewt
# )
# Add newProjectWizard executable
add_executable(newProjectWizard
newProjectWizard.cxx
)
target_compile_definitions(newProjectWizard
PRIVATE "WORKFLOWS_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}/simulation-workflows\""
)
target_link_libraries(newProjectWizard
smtkVTKSession
smtkACE3PQtExt
)
# Add newtJobTracker executable
add_executable(newtJobTracker
jobTracker.cxx
qtJobTrackerTestWidget.cxx
qtJobTrackerTestWidget.h
qtJobTrackerTestWidget.ui
)
target_compile_definitions(newtJobTracker PRIVATE USE_NEWT_TRACKER)
target_link_libraries(newtJobTracker
smtkACE3PQtExt
# smtkCumulus
smtkNewt
)
# Add newtProjectSubmit executable
add_executable(newtProjectSubmit
projectSubmit.cxx
qtProjectSubmitTestWidget.cxx
qtProjectSubmitTestWidget.h
qtProjectSubmitTestWidget.ui
)
target_compile_definitions(newtProjectSubmit
PRIVATE
USE_NEWT_INTERFACE
"WORKFLOWS_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}/simulation-workflows\""
)
target_link_libraries(newtProjectSubmit
smtkVTKSession
smtkACE3PQtExt
# smtkCumulus
smtkNewt
)
......@@ -9,7 +9,7 @@
//=========================================================================
#include "smtk/newt/qtApplicationLoginSupport.h"
#include "smtk/simulation/ace3p/testing/cxx/qtJobTrackerTestWidget.h"
#include "smtk/simulation/ace3p/examples/cxx/qtJobTrackerTestWidget.h"
#include <QApplication>
......
......@@ -12,7 +12,7 @@
#include "smtk/simulation/ace3p/Metadata.h"
#include "smtk/simulation/ace3p/Project.h"
#include "smtk/simulation/ace3p/Registrar.h"
#include "smtk/simulation/ace3p/testing/cxx/qtProjectSubmitTestWidget.h"
#include "smtk/simulation/ace3p/examples/cxx/qtProjectSubmitTestWidget.h"
// SMTK includes
#include "smtk/model/Registrar.h"
......
......@@ -8,14 +8,14 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#include "smtk/simulation/ace3p/testing/cxx/qtJobTrackerTestWidget.h"
#include "smtk/simulation/ace3p/examples/cxx/qtJobTrackerTestWidget.h"
// #include "smtk/cumulus/jobspanel/cumulusproxy.h"
#include "smtk/newt/qtNewtInterface.h"
#include "smtk/simulation/ace3p/qt/qtCumulusJobTracker.h"
#include "smtk/simulation/ace3p/qt/qtNewtJobTracker.h"
#include "smtk/simulation/ace3p/testing/cxx/ui_qtJobTrackerTestWidget.h"
#include "smtk/simulation/ace3p/examples/cxx/ui_qtJobTrackerTestWidget.h"
#include <QDebug>
#include <QJsonObject>
......
......@@ -29,7 +29,7 @@ namespace ace3p
class qtCumulusJobTracker;
class qtNewtJobTracker;
/* \brief Widget for standalong testing of qtCumulusJobTracker
/* \brief Widget for standalone testing of qtCumulusJobTracker
*
* For internal testing.
*/
......
......@@ -8,7 +8,7 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#include "smtk/simulation/ace3p/testing/cxx/qtProjectSubmitTestWidget.h"
#include "smtk/simulation/ace3p/examples/cxx/qtProjectSubmitTestWidget.h"
#include "smtk/newt/qtDownloadFolderRequester.h"
#include "smtk/newt/qtNewtInterface.h"
......@@ -20,7 +20,7 @@
#include "smtk/simulation/ace3p/qt/qtNewtJobTracker.h"
#include "smtk/simulation/ace3p/utility/AttributeUtils.h"
#include "smtk/simulation/ace3p/testing/cxx/ui_qtProjectSubmitTestWidget.h"
#include "smtk/simulation/ace3p/examples/cxx/ui_qtProjectSubmitTestWidget.h"
// SMTK includes
#include "smtk/attribute/Attribute.h"
......
......@@ -42,7 +42,7 @@ namespace ace3p
class qtNewtJobSubmitter;
class qtNewtJobTracker;
/* \brief Widget for standalong testing of job-submission
/* \brief Widget for standalone testing of job-submission
*
* For internal testing.
*/
......
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
message("CMAKE_VERSION ${CMAKE_VERSION}")
set(unit_tests
......@@ -79,61 +76,3 @@ set_tests_properties(TestExportProject
PROPERTIES
DEPENDS TestCreateProject
)
# Add cumuusJobTracker executable
# add_executable(cumulusJobTracker
# jobTracker.cxx
# qtJobTrackerTestWidget.cxx
# qtJobTrackerTestWidget.h
# qtJobTrackerTestWidget.ui
# )
# target_link_libraries(cumulusJobTracker
# smtkACE3PQtExt
# smtkCumulus
# smtkNewt
# )
# Add newProjectWizard executable
add_executable(newProjectWizard
newProjectWizard.cxx
)
target_compile_definitions(newProjectWizard
PRIVATE "WORKFLOWS_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}/simulation-workflows\""
)
target_link_libraries(newProjectWizard
smtkVTKSession
smtkACE3PQtExt
)
# Add newtJobTracker executable
add_executable(newtJobTracker
jobTracker.cxx
qtJobTrackerTestWidget.cxx
qtJobTrackerTestWidget.h
qtJobTrackerTestWidget.ui
)
target_compile_definitions(newtJobTracker PRIVATE USE_NEWT_TRACKER)
target_link_libraries(newtJobTracker
smtkACE3PQtExt
# smtkCumulus
smtkNewt
)
# Add newtProjectSubmit executable
add_executable(newtProjectSubmit
projectSubmit.cxx
qtProjectSubmitTestWidget.cxx
qtProjectSubmitTestWidget.h
qtProjectSubmitTestWidget.ui
)
target_compile_definitions(newtProjectSubmit
PRIVATE
USE_NEWT_INTERFACE
"WORKFLOWS_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}/simulation-workflows\""
)
target_link_libraries(newtProjectSubmit
smtkVTKSession
smtkACE3PQtExt
# smtkCumulus
smtkNewt
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment