Prepare for Eyescale/CMake#533

eile · Jan 20, 2017 · c3ee91c · c3ee91c
1 parent 7e40a3b
commit c3ee91c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.gitsubprojects b/.gitsubprojects
@@ -4,6 +4,6 @@ git_subproject(Servus https://github.com/HBPVIS/Servus.git 2da95ea)
 git_subproject(ZeroBuf https://github.com/HBPVIS/ZeroBuf.git f40a6e4)
 git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 1420ab9)
 git_subproject(Lexis https://github.com/HBPVis/Lexis.git 9110580)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 3a1a704)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 1f66e47)
 git_subproject(Collage https://github.com/Eyescale/Collage.git da971d6)
-git_subproject(Equalizer https://github.com/Eyescale/Equalizer.git 3e936be)
+git_subproject(Equalizer https://github.com/Eyescale/Equalizer.git acb9062)
diff --git a/apps/livre/livre.cpp b/apps/livre/livre.cpp
@@ -19,6 +19,8 @@
 
 #include <livre/eq/Engine.h>
 
+#include <eq/client.h>
+#include <eq/init.h>
 #include <stdlib.h>
 
 int main( const int argc, char** argv )
@@ -27,7 +29,8 @@ int main( const int argc, char** argv )
     {
         if( std::string( "--help" ) == argv[i] )
         {
-            std::cout << livre::Engine::getHelp() << std::endl;
+            std::cout << livre::Engine::getHelp() << eq::getHelp()
+                      << eq::Client::getHelp() << std::endl;
             return EXIT_SUCCESS;
         }
         if( std::string( "--version" ) == argv[i] )

diff --git a/apps/livreGUI/CMakeLists.txt b/apps/livreGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2016, EPFL/Blue Brain Project
+# Copyright (c) 2011-2017, EPFL/Blue Brain Project
 #                          David Steiner <steiner@ifi.uzh.ch>
 #                          Ahmet Bilgili <ahmet.bilgili@epfl.ch>
 #                          Marwan Abdellah <marwan.abdellah@epfl.ch>
@@ -66,4 +66,4 @@ endif()
 
 add_definitions(${QT_DEFINITIONS} "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED" )
 
-common_application(livreGUI GUI)
+common_application(livreGUI GUI NOHELP)
diff --git a/livre/uvf/CMakeLists.txt b/livre/uvf/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Copyright (c) 2011-2014, EPFL/Blue Brain Project
-#                     Ahmet Bilgili <ahmet.bilgili@epfl.ch>
+# Copyright (c) 2011-2017, EPFL/Blue Brain Project
+#                          Ahmet Bilgili <ahmet.bilgili@epfl.ch>
 #
 # This file is part of Livre <https://github.com/BlueBrain/Livre>
 #
@@ -8,9 +8,9 @@ if(NOT TUVOK_FOUND)
   return()
 endif()
 
-set( LIVREUVF_HEADERS "UVFDataSource.h" )
-set( LIVREUVF_SOURCES "UVFDataSource.cpp" )
-set( LIVREUVF_LINK_LIBRARIES PRIVATE LivreCore ${TUVOK_LIBRARY} )
-set( LIVREUVF_INCLUDE_NAME livre/uvf)
+set(LIVREUVF_HEADERS "UVFDataSource.h")
+set(LIVREUVF_SOURCES "UVFDataSource.cpp")
+set(LIVREUVF_LINK_LIBRARIES PRIVATE LivreCore ${TUVOK_LIBRARY})
+set(LIVREUVF_INCLUDE_NAME livre/uvf)
 
-common_library( LivreUVF ${LIVREUVF_HEADERS} ${LIVRE_UVF_SOURCES} )
+common_library(LivreUVF ${LIVREUVF_HEADERS} ${LIVRE_UVF_SOURCES})