Skip to content

Commit

Permalink
Updated 3rdParty with new cppzmq library. Extended makefile.common fo…
Browse files Browse the repository at this point in the history 
…r installing zmq config files to libzmq/build/ folder, for using find_package(zeromq) in cmake. Installing cppzqm file to cppzmq/build/
  • Loading branch information
@niklwors @adrpo
niklwors authored and adrpo committed Oct 6, 2019
1 parent 41c101f commit 34a08f5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion OMCompiler/3rdParty
Submodule 3rdParty updated 29 files
+53 −0 cppzmq/.clang-format
+5 −0 cppzmq/.gitignore
+98 −0 cppzmq/.travis.yml
+93 −0 cppzmq/CMakeLists.txt
+17 −0 cppzmq/LICENSE
+92 −0 cppzmq/README.md
+40 −0 cppzmq/appveyor.yml
+69 −0 cppzmq/ci_build.sh
+8 −0 cppzmq/cmake/DetectCPPZMQVersion.cmake
+36 −0 cppzmq/cppzmqConfig.cmake.in
+23 −0 cppzmq/demo/CMakeLists.txt
+7 −0 cppzmq/demo/main.cpp
+26 −0 cppzmq/libzmq-pkg-config/FindZeroMQ.cmake
+48 −0 cppzmq/tests/CMakeLists.txt
+416 −0 cppzmq/tests/active_poller.cpp
+306 −0 cppzmq/tests/buffer.cpp
+27 −0 cppzmq/tests/cmake/catch.cmake
+29 −0 cppzmq/tests/context.cpp
+200 −0 cppzmq/tests/message.cpp
+148 −0 cppzmq/tests/monitor.cpp
+181 −0 cppzmq/tests/multipart.cpp
+329 −0 cppzmq/tests/poller.cpp
+300 −0 cppzmq/tests/socket.cpp
+118 −0 cppzmq/tests/socket_ref.cpp
+51 −0 cppzmq/tests/testutil.hpp
+96 −0 cppzmq/tests/utilities.cpp
+21 −0 cppzmq/version.sh
+2,069 −0 cppzmq/zmq.hpp
+457 −0 cppzmq/zmq_addon.hpp
20 changes: 12 additions & 8 deletions OMCompiler/Makefile.common
View file
Expand Up @@ -226,7 +226,7 @@ all-runtimeCPPinstall: CMinpack sundials
omc-and-runtimeCPPinstall: CMinpack sundials
$(MAKE) omc runtimeCPPinstall OMBUILDDIR=$(OMBUILDDIR)

runtimeCPP: CMinpack sundials antlr-copy $(MINGW_EXTRA_LIBS) omc
runtimeCPP: cppzmq CMinpack sundials antlr-copy $(MINGW_EXTRA_LIBS) omc
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)

CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
Expand Down Expand Up @@ -304,25 +304,29 @@ CMinpack-clean:
rm -rf 3rdParty/CMinpack/build

libzmq: $(builddir_lib_omc)/$(LIBZMQLIB)
$(builddir_lib_omc)/$(LIBZMQLIB):
test -d 3rdParty/libzmq
mkdir -p 3rdParty/libzmq/build
(cd 3rdParty/libzmq/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE_CHECK_UNDEFINED_LOOKUP) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_AR:String="$(AR)" -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DWITH_PERF_TOOL:Bool=OFF -DZMQ_BUILD_TESTS:Bool=OFF -DENABLE_CPACK:Bool=OFF -DCMAKE_BUILD_TYPE=Release .. -G $(CMAKE_TARGET))
test -f 3rdParty/libzmq/build/lib/$(LIBZMQLIB) || $(MAKE) -C 3rdParty/libzmq/build
(cd 3rdParty/libzmq/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE_CHECK_UNDEFINED_LOOKUP) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_AR:String="$(AR)" -DCMAKE_INSTALL_PREFIX="`pwd`" -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DWITH_PERF_TOOL:Bool=OFF -DZMQ_BUILD_TESTS:Bool=OFF -DENABLE_CPACK:Bool=OFF -DCMAKE_BUILD_TYPE=Release .. -G $(CMAKE_TARGET))
test -f 3rdParty/libzmq/build/lib/$(LIBZMQLIB) || $(MAKE) -C 3rdParty/libzmq/build install
test ! `uname` = Darwin || install_name_tool -id @rpath/$(LIBZMQLIB) 3rdParty/libzmq/build/lib/$(LIBZMQLIB)
# copy dll/so to $(LIB_OMC) and $(builddir_bin) folders
(rm -f $(builddir_lib_omc)/$(LIBZMQLIB)*)
(rm -f $(builddir_bin)/$(LIBZMQLIB)*)
#(rm -f $(builddir_lib_omc)/$(LIBZMQLIB)*)
#(rm -f $(builddir_bin)/$(LIBZMQLIB)*)
(cp -af 3rdParty/libzmq/build/lib/$(LIBZMQLIB)* $(builddir_lib_omc))
# Darwin has to be special always; libzmq*.dylib while Linux is libzmq.so* ...
(test ! `uname` = Darwin || cp -af 3rdParty/libzmq/build/lib/lib*.dylib $(builddir_lib_omc))
ifeq ($(SHREXT),.dll)
(cp -af 3rdParty/libzmq/build/lib/$(LIBZMQLIB)* $(builddir_bin))
endif

cppzmq: libzmq
test -d 3rdParty/cppzmq
mkdir -p 3rdParty/cppzmq/build
(cd 3rdParty/cppzmq/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE_CHECK_UNDEFINED_LOOKUP) -DCMAKE_FIND_DEBUG_MODE:Bool=ON -DCPPZMQ_BUILD_TESTS:Bool=OFF -DZeroMQ_DIR=../libzmq/build/share/cmake/ZeroMQ -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_FIND_DEBUG_MODE:Bool=ON -DCMAKE_AR:String="$(AR)" -DCMAKE_INSTALL_PREFIX="`pwd`" -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DWITH_PERF_TOOL:Bool=OFF .. -G $(CMAKE_TARGET))
$(MAKE) -C 3rdParty/cppzmq/build install
libzmq-clean:
rm -rf 3rdParty/libzmq/build

cppzmq-clean:
rm -rf 3rdParty/cppzmq/build
metis: $(OMBUILDDIR)/$(LIB_OMC)/libmetis$(STAEXT)
$(OMBUILDDIR)/$(LIB_OMC)/libmetis$(STAEXT): 3rdParty/metis-5.1.0/CMakeLists.txt
(cd 3rdParty/metis-5.1.0 && $(CMAKE) ./ -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -G $(CMAKE_TARGET) && CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE))
Expand Down

0 comments on commit 34a08f5

Please sign in to comment.