mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
big code cleanup. mostly line endings and indentions (#659)
No functional changes - except protobuffer is mandatory and not optional now. Former-commit-id: 1e6347e708707cc388cdedb8d0352a9f017030b8
This commit is contained in:
@@ -1,48 +1,48 @@
|
||||
|
||||
# Define the current source locations
|
||||
set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/jsonserver)
|
||||
set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/jsonserver)
|
||||
|
||||
# Group the headers that go through the MOC compiler
|
||||
set(JsonServer_QT_HEADERS
|
||||
${CURRENT_HEADER_DIR}/JsonServer.h
|
||||
${CURRENT_SOURCE_DIR}/JsonClientConnection.h
|
||||
)
|
||||
|
||||
set(JsonServer_HEADERS
|
||||
)
|
||||
|
||||
set(JsonServer_SOURCES
|
||||
${CURRENT_SOURCE_DIR}/JsonServer.cpp
|
||||
${CURRENT_SOURCE_DIR}/JsonClientConnection.cpp
|
||||
)
|
||||
|
||||
set(JsonServer_RESOURCES
|
||||
${CURRENT_SOURCE_DIR}/JsonSchemas.qrc
|
||||
)
|
||||
if(ENABLE_QT5)
|
||||
qt5_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
||||
qt5_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
||||
else(ENABLE_QT5)
|
||||
qt4_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
||||
qt4_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
||||
endif(ENABLE_QT5)
|
||||
|
||||
add_library(jsonserver
|
||||
${JsonServer_HEADERS}
|
||||
${JsonServer_QT_HEADERS}
|
||||
${JsonServer_SOURCES}
|
||||
${JsonServer_RESOURCES}
|
||||
${JsonServer_HEADERS_MOC}
|
||||
${JsonServer_RESOURCES_RCC}
|
||||
)
|
||||
|
||||
if(ENABLE_QT5)
|
||||
qt5_use_modules(jsonserver Widgets Network)
|
||||
endif(ENABLE_QT5)
|
||||
|
||||
target_link_libraries(jsonserver
|
||||
hyperion
|
||||
hyperion-utils
|
||||
jsoncpp
|
||||
${QT_LIBRARIES})
|
||||
|
||||
# Define the current source locations
|
||||
set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/jsonserver)
|
||||
set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/jsonserver)
|
||||
|
||||
# Group the headers that go through the MOC compiler
|
||||
set(JsonServer_QT_HEADERS
|
||||
${CURRENT_HEADER_DIR}/JsonServer.h
|
||||
${CURRENT_SOURCE_DIR}/JsonClientConnection.h
|
||||
)
|
||||
|
||||
set(JsonServer_HEADERS
|
||||
)
|
||||
|
||||
set(JsonServer_SOURCES
|
||||
${CURRENT_SOURCE_DIR}/JsonServer.cpp
|
||||
${CURRENT_SOURCE_DIR}/JsonClientConnection.cpp
|
||||
)
|
||||
|
||||
set(JsonServer_RESOURCES
|
||||
${CURRENT_SOURCE_DIR}/JsonSchemas.qrc
|
||||
)
|
||||
if(ENABLE_QT5)
|
||||
qt5_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
||||
qt5_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
||||
else()
|
||||
qt4_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
||||
qt4_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
||||
endif()
|
||||
|
||||
add_library(jsonserver
|
||||
${JsonServer_HEADERS}
|
||||
${JsonServer_QT_HEADERS}
|
||||
${JsonServer_SOURCES}
|
||||
${JsonServer_RESOURCES}
|
||||
${JsonServer_HEADERS_MOC}
|
||||
${JsonServer_RESOURCES_RCC}
|
||||
)
|
||||
|
||||
if(ENABLE_QT5)
|
||||
qt5_use_modules(jsonserver Widgets Network)
|
||||
endif()
|
||||
|
||||
target_link_libraries(jsonserver
|
||||
hyperion
|
||||
hyperion-utils
|
||||
jsoncpp
|
||||
${QT_LIBRARIES})
|
||||
|
Reference in New Issue
Block a user