Commit ec5486c1 authored by Robert Maynard's avatar Robert Maynard

build zmq in cmb superbuild, stop using remus superbuild.

Remus superbuild was building zmq by doing some really fancy work
by upgrading the solution file that zeroMQ had. Instead we know use
the CMakeified branch of zeroMQ from github.
parent b03f1b89
......@@ -28,6 +28,7 @@ macro (SetupCMBSuperBuild)
ENABLE_visitbridge
ENABLE_vxl
ENABLE_zlib
ENABLE_zeroMQ
)
if (UNIX AND NOT APPLE)
mark_as_advanced(FORCE
......
......@@ -197,6 +197,7 @@ include(gdal)
include(kml)
include(vxl)
include(molequeue)
include(zeroMQ)
include(remus)
include(cmb)
......
add_external_project(remus
DEPENDS boost
DEPENDS boost zeroMQ
CMAKE_ARGS
-DBUILD_SHARED_LIBS=OFF
-DREMUS_INSTALL_DIR=<INSTALL_DIR>
-DUSE_SYSTEM_BOOST=ON
INSTALL_COMMAND ""
)
if(MSVC)
#add in a custom post install command that copy the zeroMQ dll to the debug folder
add_external_project_step(installRemusDebugDll
COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/lib/libzmq.dll ${SuperBuild_BINARY_DIR}/bin/Debug/libzmq.dll
DEPENDEES install
)
#add in a custom post install command that copy the zeroMQ dll to the release folder
add_external_project_step(installRemusReleaseDll
COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/lib/libzmq.dll ${SuperBuild_BINARY_DIR}/bin/Release/libzmq.dll
DEPENDEES install
)
endif()
-DRemus_ENABLE_EXAMPLES:BOOL=OFF
-DRemus_NO_SYSTEM_BOOST:BOOL=ON
-DZeroMQ_ROOT_DIR=<INSTALL_DIR>
-DBOOST_INCLUDEDIR=<INSTALL_DIR>/include/boost
-DBOOST_LIBRARYDIR=<INSTALL_DIR>/lib
)
add_external_project(zeroMQ
DEPENDS boost
CMAKE_ARGS
-DBUILD_SHARED_LIBS=ON
)
#add in a custom post install command that copy the zeroMQ dll to the debug folder
add_external_project_step(installRemusDebugDll
COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/lib/libzmq.dll ${SuperBuild_BINARY_DIR}/bin/Debug/libzmq.dll
DEPENDEES install
)
#add in a custom post install command that copy the zeroMQ dll to the release folder
add_external_project_step(installRemusReleaseDll
COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/lib/libzmq.dll ${SuperBuild_BINARY_DIR}/bin/Release/libzmq.dll
DEPENDEES install
)
#we have multiple problems with how zeroMQ builds
#and tries to install itself on unix. All it comes
#down too is poor support with directories with spaces in the name
#to work around the configure issue with a path to the configure script
#with a space, we build in the source directory which has no problems
#with a space in the path.
if("${CMAKE_CURRENT_BINARY_DIR}" MATCHES " ")
#to work around libtool having issues with where the install directory
#has a space in the name we have to do something farm more complex.
#1. we create a temporary folder in the temp directory use mktemp
#2. we create a simlink in that folder to the real install dir
#3. we set zeroMQ install dir to the symlink
execute_process(COMMAND mktemp -d /tmp/zeroMQ.XXXX OUTPUT_VARIABLE tempDir)
string(STRIP ${tempDir} tempDir) #remove all whitespace and newline
set(zero_install_dir "${tempDir}/zero_install_dir")
execute_process(COMMAND ln -s ${install_location} ${zero_install_dir} )
else()
#no spaces so we don't have to create the temp folder
set(zero_install_dir ${install_location})
endif()
add_external_project(zeroMQ
CONFIGURE_COMMAND <SOURCE_DIR>/configure
--prefix=${zero_install_dir}
BUILD_IN_SOURCE 1
)
ExternalProject_Get_Property(zeroMQ install_dir)
add_project_property(zeroMQ ZeroMQ_ROOT_DIR ${install_dir})
......@@ -82,7 +82,7 @@ add_revision(manta
add_revision(molequeue
GIT_REPOSITORY git://source.openchemistry.org/molequeue.git
GIT_TAG e34c94f6685a3611ad1bfbe5c2fe6123d3ee1cea)
GIT_TAG e545ee25b4b79d5bae9e1)
if (UNIX)
add_revision(mpi
......@@ -138,9 +138,13 @@ add_revision(vxl
URL http://vtk.org/files/support/vxl_r35313.tar.gz
URL_MD5 cb7884a8eb0f816a4bb378dc968c8333)
add_revision(zeroMQ
GIT_REPOSITORY https://github.com/robertmaynard/zeromq2-x
GIT_TAG master)
add_revision(remus
GIT_REPOSITORY git://public.kitware.com/Remus.git
GIT_TAG f3ebc349c1a11a)
GIT_TAG master)
add_revision(kml
URL http://vtk.org/files/support/libkml_fa6c7d8.tar.gz
......
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