diff --git a/CMakeLists.txt b/CMakeLists.txt index d489f57..6b2df32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ if(CMAKE_CROSSCOMPILING) endif() endif() option(LIB "System install" 1) -option(QGLVIEW "Build QGLview library and utils" 1) +option(QGLVIEW "Build QGLview library and utils" 0) option(QGLENGINE "Build QGLENGINE library and utils" 0) option(UTILS "Build various utils" 1) option(DESIGNER_PLUGINS "Build qt designer plugins" 1) diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index e798b52..1a88c92 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -1,22 +1,47 @@ cmake_minimum_required(VERSION 3.0) project(qcd_utils) +set(_QCD_MAJOR 1) +set(_QCD_MINOR 0) +set(_QCD_REVISION 0) +set(_QCD_SUFFIX "") +set(_QCD_COMPANY SHS) +set(_QCD_DOMAIN org.SHS) +if(NOT DEFINED BUILD_NUMBER) + set(BUILD_NUMBER 9999) +endif() if (NOT LIBPROJECT) find_package(PIP REQUIRED) option(LIB "System install" 0) - option(DEBUG "Build with -g3" 0) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall") - if (DEBUG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") + if (CMAKE_BUILD_TYPE MATCHES Debug) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -Wall") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall") endif() + include(DeployMacros) endif() +set_version(${PROJECT_NAME}5 + MAJOR ${_QCD_MAJOR} + MINOR ${_QCD_MINOR} + REVISION ${_QCD_REVISION} + BUILD ${BUILD_NUMBER} + SUFFIX ${_QCD_SUFFIX}) + find_package(QAD REQUIRED) list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME}) set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") find_qt(${QtVersions} Core Gui) +set_deploy_property(${PROJECT_NAME}5 SHARED + LABEL ${PROJECT_NAME} + FULLNAME "${_QCD_DOMAIN}.${PROJECT_NAME}" + COMPANY ${_QCD_COMPANY} + INFO "QCD library") +make_rc(${PROJECT_NAME}5 out_RC) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) -qt_add_library(${PROJECT_NAME} SHARED out_CPP) +qt_add_library(${PROJECT_NAME} SHARED out_CPP ${out_RC}) qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_graphic cd_utils piqt) message(STATUS "Building ${PROJECT_NAME}") diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt index 6968e0b..b2eda72 100644 --- a/qcd_utils/pult/CMakeLists.txt +++ b/qcd_utils/pult/CMakeLists.txt @@ -1,8 +1,20 @@ project(cd_pult) +set_version(${PROJECT_NAME}5 + MAJOR ${_QCD_MAJOR} + MINOR ${_QCD_MINOR} + REVISION ${_QCD_REVISION} + BUILD ${BUILD_NUMBER} + SUFFIX ${_QCD_SUFFIX}) find_qt(${QtVersions} Core Gui OpenGL) +set_deploy_property(${PROJECT_NAME}5 + LABEL ${PROJECT_NAME} + FULLNAME "${_QCD_DOMAIN}.${PROJECT_NAME}" + COMPANY ${_QCD_COMPANY} + INFO "CD Pult") +make_rc(${PROJECT_NAME}5 out_RC) qt_sources(SRC) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) -qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP ${out_RC}) qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic qad_application qcd_utils piqt_utils) qt_target_include_directories(${PROJECT_NAME} PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../../piqt_utils") message(STATUS "Building ${PROJECT_NAME}") @@ -21,3 +33,5 @@ else() qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") endif() +message(STATUS "Qt5_ROOT=${Qt5_ROOT}") +deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release)