Commit 3e07f93c authored by Ben Boeckel's avatar Ben Boeckel

molequeue: add back to the superbuild

parent 497089e0
Pipeline #44834 passed with stage
......@@ -29,6 +29,7 @@ function (superbuild_find_projects var)
gdal
hdf5
moab
molequeue
netcdf
numpy
oce
......
......@@ -117,6 +117,7 @@ ignore_project_warnings(boost)
ignore_project_warnings(gdal)
ignore_project_warnings(hdf5)
ignore_project_errors(hdf5)
ignore_project_warnings(molequeue)
ignore_project_warnings(python)
ignore_project_warnings(qt4)
ignore_project_warnings(shiboken)
......
......@@ -3,6 +3,9 @@
include(cmb-version)
include(paraview-version)
set(GrabCuts_is_regular_executable TRUE)
set(molequeue_is_regular_executable TRUE)
set(CPACK_PACKAGE_VENDOR "Kitware, Inc.")
set(CPACK_RESOURCE_FILE_LICENSE
"${superbuild_source_directory}/License.txt")
......
......@@ -17,7 +17,7 @@ superbuild_add_project(cmb
cmbworkflows zeromq opencv
smtk # XXX(smtk): until the submodule works properly
DEPENDS_OPTIONAL moab smtk cumulus ${cmb_extra_optional_dependencies}
cxx11
molequeue cxx11
CMAKE_ARGS
${extra_cmake_args}
-DKML_DIR:PATH=<INSTALL_DIR>
......
superbuild_add_dummy_project(cumulus
DEPENDS pythongirderclient pythonrequests pythonsetuptools pythonsix
)
DEPENDS pythongirderclient pythonrequests pythonsetuptools pythonsix)
......@@ -12,6 +12,16 @@ set(cmb_programs_to_install
PointsBuilder
paraview)
if (molequeue_enabled)
if (APPLE)
set(molequeue_name "MoleQueue")
else ()
set(molequeue_name "molequeue")
endif ()
list(APPEND cmb_programs_to_install
"${molequeue_name}")
endif ()
set(cmb_install_paraview_server TRUE)
set(cmb_install_paraview_python TRUE)
......
......@@ -6,6 +6,16 @@ set(cmb_package_name "ModelBuilder")
set(cmb_programs_to_install
ModelBuilder)
if (molequeue_enabled)
if (APPLE)
set(molequeue_name "MoleQueue")
else ()
set(molequeue_name "molequeue")
endif ()
list(APPEND cmb_programs_to_install
"${molequeue_name}")
endif ()
set(cmb_install_paraview_server FALSE)
set(cmb_install_paraview_python TRUE)
......
superbuild_add_project(molequeue
DEPENDS qt4
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_INSTALL_LIBDIR:PATH=lib
-DENABLE_TESTING:BOOL=OFF)
# https://github.com/OpenChemistry/molequeue/pull/13
superbuild_apply_patch(molequeue gcc6-support
"Support GCC6 detection")
# https://github.com/OpenChemistry/molequeue/pull/14
superbuild_apply_patch(molequeue atexit-include
"Include cstdlib for atexit(3)")
commit 2bb22faa94878a5192fa148bb886062e19a4a7b1
Author: Ben Boeckel <ben.boeckel@kitware.com>
Date: Tue Dec 20 17:09:49 2016 -0500
messageidmanager_p: include cstdlib for atexit(3)
diff --git a/molequeue/servercore/messageidmanager_p.cpp b/molequeue/servercore/messageidmanager_p.cpp
index 1f0e9c9..eb87946 100644
--- a/molequeue/servercore/messageidmanager_p.cpp
+++ b/molequeue/servercore/messageidmanager_p.cpp
@@ -18,6 +18,8 @@
#include "message.h"
+#include <cstdlib>
+
namespace MoleQueue {
MessageIdManager *MessageIdManager::m_instance = NULL;
commit 121ec08734de6471a63da2b89e6a93dc47123784
Author: Ben Boeckel <ben.boeckel@kitware.com>
Date: Tue Dec 20 14:28:40 2016 -0500
GenerateExportHeader: fix compiler version detection
exec_program is deprecated and there was never an `ARGS` argument
anyways.
diff --git a/cmake/GenerateExportHeader.cmake b/cmake/GenerateExportHeader.cmake
index a91da06..9105b74 100644
--- a/cmake/GenerateExportHeader.cmake
+++ b/cmake/GenerateExportHeader.cmake
@@ -162,14 +162,14 @@ endmacro()
macro(_test_compiler_hidden_visibility)
if(CMAKE_COMPILER_IS_GNUCXX)
- exec_program(${CMAKE_C_COMPILER} ARGS --version
+ execute_process(COMMAND ${CMAKE_C_COMPILER} --version
OUTPUT_VARIABLE _gcc_version_info)
- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
+ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]"
_gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
# patch level, handle this here:
if(NOT _gcc_version)
- string(REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0"
+ string(REGEX REPLACE ".*\\(GCC\\).* ([3-9]\\.[0-9]) .*" "\\1.0"
_gcc_version "${_gcc_version_info}")
endif()
@@ -179,7 +179,7 @@ macro(_test_compiler_hidden_visibility)
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
- exec_program(${CMAKE_CXX_COMPILER} ARGS -V
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -V
OUTPUT_VARIABLE _intel_version_info)
string(REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" "\\1"
_intel_version "${_intel_version_info}")
......@@ -10,7 +10,7 @@ endif ()
set(plugins)
foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
if (executable STREQUAL "GrabCuts")
if (${executable}_is_regular_executable)
superbuild_unix_install_program("${superbuild_install_location}/bin/${executable}"
"lib"
SEARCH_DIRECTORIES "${library_paths}")
......
......@@ -32,6 +32,10 @@ superbuild_set_revision(cmbworkflows
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/simulation-workflows.git"
GIT_TAG origin/master)
superbuild_set_revision(molequeue
URL "http://www.computationalmodelbuilder.org/files/dependencies/molequeue-0.7.1.tar.gz"
URL_MD5 d4abe9e3fb91d707eab8e13bbdf50c42)
superbuild_set_revision(vxl
# https://github.com/judajake/vxl.git
URL "http://www.paraview.org/files/dependencies/vxl-44433e4bd8ca3eabe4e5441444bf2a050d689d45.tar.bz2"
......
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