admin/noo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- further work to migrate to CMake

Browse Source
This commit is contained in:
Dmytro Bogovych 2019-11-13 13:30:44 +02:00
parent a0e9d2e601
commit d1ab61561c
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/CMakeLists.txt
View File

@ -6,7 +6,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X deployment ve
project (outliner C CXX) # Your project name project (outliner C CXX) # Your project name
if (NOT LIB_PLATFORM) if (NOT LIB_PLATFORM)
message(FATAL_ERROR "No LIB_PLATFORM is set.") message("No LIB_PLATFORM is set, defaulting to works/sevana/platform/libraries")
set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../../sevana/platform/libraries)
endif() endif()
include (${LIB_PLATFORM}/platform_libs.cmake) include (${LIB_PLATFORM}/platform_libs.cmake)
@ -25,19 +26,7 @@ set (CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run uic automatically when needed. # Instruct CMake to run uic automatically when needed.
set (CMAKE_AUTOUIC ON) set (CMAKE_AUTOUIC ON)
set (APP_SKIP_BUILD_NUMBER OFF CACHE BOOL "Skip Sevana HASQ build number increase.") set (APP_SKIP_BUILD_NUMBER OFF CACHE BOOL "Skip Litt build number increase.")
# Use pvqa2 library also
set (USE_PVQA2_LIBRARY OFF CACHE BOOL "Integrate PVQA2.")
# Avoid increasing PVQA/AQuA library build numbers
set (SKIP_BUILD_NUMBER ON)
# Special build for audiologists
set (AUDIOLOGY_EDITION OFF CACHE BOOL "Make special build for audiologists")
# Special build with live capture
set (LIVE_PVQA_EDITION OFF CACHE BOOL "Make special build with live capture")
# This will find the Qt5 files. You will need a QT5_DIR env variable # This will find the Qt5 files. You will need a QT5_DIR env variable
find_package (Qt5Core REQUIRED) find_package (Qt5Core REQUIRED)
@ -87,7 +76,7 @@ if(TARGET_OSX)
set (BUILD_NUMBER_SCRIPT build_number.sh) set (BUILD_NUMBER_SCRIPT build_number.sh)
set (ADDITIONAL_EXE_OPTIONS MACOSX_BUNDLE) set (ADDITIONAL_EXE_OPTIONS MACOSX_BUNDLE)
set (MACOS_ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../icons/sound_ruler.icns) set (MACOS_ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/icons/appicon-osx.icns)
endif() endif()
if (TARGET_WIN) if (TARGET_WIN)
@ -124,6 +113,7 @@ endif()
# This will create you executable # This will create you executable
set (EXE_NAME Litt) set (EXE_NAME Litt)
set (PRODUCT_NAME Litt)
add_executable(${EXE_NAME} add_executable(${EXE_NAME}
${ADDITIONAL_EXE_OPTIONS} ${ADDITIONAL_EXE_OPTIONS}

2
client/encryption.h
View File

@ -2,7 +2,7 @@
#define ENCRYPTION_H #define ENCRYPTION_H
#include <QByteArray> #include <QByteArray>
#include <openssl/blowfish.h> #include <openssl/blowfish.h">
#include <openssl/sha.h> #include <openssl/sha.h>
#include "twofish.h" #include "twofish.h"

26
client/fervor/CMakeLists.txt
View File

@ -1,12 +1,20 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(Fervor) project(Fervor)
option(FERVOR_BUILD_SAMPLE "Should the sample be built?" OFF)
option(FERVOR_BUILD_TESTS "Should the tests be built" OFF) option (FERVOR_BUILD_SAMPLE "Should the sample be built?" OFF)
find_package(Qt4 REQUIRED) option (FERVOR_BUILD_TESTS "Should the tests be built" OFF)
set(QT_USE_QTNETWORK true)
set(QT_USE_QTWEBKIT true) find_package (Qt5Core REQUIRED)
include(${QT_USE_FILE}) find_package (Qt5Gui REQUIRED)
add_definitions(${QT_DEFINITIONS})
set (QT_USE_QTNETWORK true)
set (QT_USE_QTWEBKIT true)
set (FERVOR_APP_VERSION "0.9.2")
set (FERVOR_APP_NAME "Litt")
#include(${QT_USE_FILE})
#add_definitions(${QT_DEFINITIONS})
if(DEFINED FERVOR_APP_VERSION) if(DEFINED FERVOR_APP_VERSION)
add_definitions(-DFV_APP_VERSION="${FERVOR_APP_VERSION}") add_definitions(-DFV_APP_VERSION="${FERVOR_APP_VERSION}")
else() else()
@ -44,8 +52,8 @@ set(UIS
fvupdatewindow.ui fvupdatewindow.ui
) )
qt4_wrap_ui(UI_HEADERS ${UIS}) #qt4_wrap_ui(UI_HEADERS ${UIS})
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS}) #qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
include_directories( include_directories(
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}