forked from BlueBrain/Tide
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve command line parsing, adapt to Eyescale/CMake#533
- Loading branch information
Raphael Dumusc
committed
Jan 26, 2017
1 parent
b6f0a7f
commit abae35b
Showing
43 changed files
with
541 additions
and
425 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
# -*- mode: cmake -*- | ||
# CMake/common https://github.com/Eyescale/CMake.git 3d5d284 | ||
# CMake/common https://github.com/Eyescale/CMake.git 40e030e |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# -*- mode: cmake -*- | ||
git_subproject(ZeroEQ https://github.com/HBPVIS/ZeroEQ.git 9b7ca61) | ||
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 76526f0) | ||
git_subproject(TUIO https://github.com/BlueBrain/TUIO.git fdf5cf7) | ||
git_subproject(ZeroEQ https://github.com/HBPVIS/ZeroEQ.git 505caf8) | ||
git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 7ebb0a5) | ||
git_subproject(TUIO https://github.com/BlueBrain/TUIO.git 67a65ad) | ||
git_subproject(VirtualKeyboard https://github.com/rdumusc/QtFreeVirtualKeyboard.git b2f79e3) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,47 @@ | ||
# Copyright (c) 2013-2016, EPFL/Blue Brain Project | ||
# Copyright (c) 2013-2017, EPFL/Blue Brain Project | ||
# Raphael Dumusc <raphael.dumusc@epfl.ch> | ||
|
||
include(CommonHelp) | ||
|
||
include_directories(${PROJECT_SOURCE_DIR}/tide/core) | ||
|
||
add_subdirectory(TideForker) | ||
add_subdirectory(TideMaster) | ||
add_subdirectory(TideWall) | ||
add_subdirectory(Launcher) | ||
add_subdirectory(Whiteboard) | ||
|
||
set(_tide_in ${CMAKE_CURRENT_SOURCE_DIR}/tide) | ||
set(_tide_out ${PROJECT_BINARY_DIR}/bin/tide) | ||
add_custom_command( | ||
DEPENDS ${_tide_in} | ||
OUTPUT ${_tide_out} | ||
POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${_tide_in} ${_tide_out} | ||
) | ||
add_custom_target(tide ALL DEPENDS ${_tide_out} tideForker tideMaster tideWall | ||
tideLauncher tideWhiteboard | ||
) | ||
add_dependencies(${PROJECT_NAME}-all tide) | ||
|
||
if(TARGET Qt5::WebKitWidgets) | ||
add_subdirectory(LocalStreamer) | ||
add_subdirectory(LocalStreamer) | ||
add_dependencies(tide tideLocalstreamer) | ||
endif() | ||
if(TARGET Qt5::WebEngine) | ||
add_subdirectory(Webbrowser) | ||
add_dependencies(tide tideWebbrowser) | ||
endif() | ||
|
||
install(PROGRAMS pyramidmaker tide DESTINATION bin COMPONENT apps) | ||
|
||
# Copy the startup script and default config to the bin folder to be able to | ||
# launch after building without requiring an install folder and 'make install' | ||
file(COPY pyramidmaker tide DESTINATION ${CMAKE_BINARY_DIR}/bin) | ||
file(COPY ${PROJECT_SOURCE_DIR}/examples/configuration_1x3.xml | ||
DESTINATION ${CMAKE_BINARY_DIR}/share/Tide/examples | ||
file( | ||
COPY ${PROJECT_SOURCE_DIR}/examples/configuration_1x3.xml | ||
DESTINATION ${PROJECT_BINARY_DIR}/share/Tide/examples | ||
) | ||
|
||
file(COPY pyramidmaker DESTINATION ${PROJECT_BINARY_DIR}/bin) | ||
install(PROGRAMS pyramidmaker tide DESTINATION bin COMPONENT apps) | ||
|
||
# Generate application help pages for doxygen | ||
common_help(tide LOCATION ${_tide_out}) | ||
common_help(pyramidmaker LOCATION ${PROJECT_BINARY_DIR}/bin/pyramidmaker) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
|
||
# Copyright (c) 2013-2015, EPFL/Blue Brain Project | ||
# Copyright (c) 2013-2017, EPFL/Blue Brain Project | ||
# Raphael Dumusc <raphael.dumusc@epfl.ch> | ||
|
||
include_directories(${PROJECT_SOURCE_DIR}/tide/master) | ||
|
||
set(LOCALSTREAMER_HEADERS | ||
set(TIDELOCALSTREAMER_HEADERS | ||
Application.h | ||
) | ||
|
||
set(LOCALSTREAMER_SOURCES | ||
main.cpp | ||
set(TIDELOCALSTREAMER_SOURCES | ||
Application.cpp | ||
main.cpp | ||
) | ||
|
||
set(LOCALSTREAMER_LINK_LIBRARIES TideMaster Deflect) | ||
set(TIDELOCALSTREAMER_LINK_LIBRARIES TideMaster Deflect) | ||
|
||
common_application(localstreamer) | ||
common_application(tideLocalstreamer NOHELP) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
# Copyright (c) 2013-2016, EPFL/Blue Brain Project | ||
# Copyright (c) 2013-2017, EPFL/Blue Brain Project | ||
# Raphael Dumusc <raphael.dumusc@epfl.ch> | ||
|
||
include_directories(${PROJECT_SOURCE_DIR}/tide/master) | ||
|
||
set(TIDEFORKER_SOURCES main.cpp) | ||
set(TIDEFORKER_LINK_LIBRARIES TideMaster) | ||
common_application(tideForker) | ||
common_application(tideForker NOHELP) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
# Copyright (c) 2013-2016, EPFL/Blue Brain Project | ||
# Copyright (c) 2013-2017, EPFL/Blue Brain Project | ||
# Raphael Dumusc <raphael.dumusc@epfl.ch> | ||
|
||
include_directories(${PROJECT_SOURCE_DIR}/tide/master) | ||
|
||
set(TIDEMASTER_SOURCES main.cpp) | ||
set(TIDEMASTER_LINK_LIBRARIES TideMaster) | ||
common_application(tideMaster) | ||
common_application(tideMaster NOHELP) |
Oops, something went wrong.