Skip to content
This repository has been archived by the owner on May 6, 2021. It is now read-only.

Commit

Permalink
integrated webserver ... (#697)
Browse files Browse the repository at this point in the history
* initial commit of webconfig

* update example config with webconfig and fix format of file
update debian postinst script for install example config
  • Loading branch information
redPanther authored and brindosch committed Jun 12, 2016
1 parent d2f4725 commit 7dfb9f1
Show file tree
Hide file tree
Showing 55 changed files with 8,952 additions and 76 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ find_package(GitVersion)
configure_file("${PROJECT_SOURCE_DIR}/HyperionConfig.h.in" "${PROJECT_BINARY_DIR}/HyperionConfig.h")
include_directories("${PROJECT_BINARY_DIR}")

if(ENABLE_QT5)
ADD_DEFINITIONS ( -DENABLE_QT5 )
if( NOT ENABLE_QT5)
#ADD_DEFINITIONS ( -DENABLE_QT5 )
#find_package(Qt5Widgets)
else()
#else()
# Add specific cmake modules to find qt4 (default version finds first available QT which might not be qt4)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt4)
endif()
Expand Down
1 change: 1 addition & 0 deletions HyperionConfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

// Define to enable profiler for development purpose
#cmakedefine ENABLE_PROFILER
#cmakedefine ENABLE_QT5

// the hyperion build id string
#define HYPERION_VERSION_ID "${HYPERION_VERSION_ID}"
Loading

0 comments on commit 7dfb9f1

Please sign in to comment.