From 861a44bab167b8042d0c3f819ea32a1a6ffc9b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 18 Apr 2017 20:48:16 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@184 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 7 +++++-- cd_utils/CMakeLists.txt | 6 +++++- kx_utils/CMakeLists.txt | 6 +++++- piqt/CMakeLists.txt | 6 +++++- piqt_utils/CMakeLists.txt | 8 ++++++-- qad_application/CMakeLists.txt | 6 +++++- qad_blockview/CMakeLists.txt | 6 +++++- qad_graphic/CMakeLists.txt | 6 +++++- qad_sql_table/CMakeLists.txt | 6 +++++- qad_utils/CMakeLists.txt | 6 +++++- qad_utils/qpiconfig.h | 2 +- qad_widgets/CMakeLists.txt | 6 +++++- qcd_utils/CMakeLists.txt | 6 +++++- qglview/CMakeLists.txt | 6 +++++- touch_widgets/CMakeLists.txt | 6 +++++- 15 files changed, 72 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c90a068..1c800a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(PIP_INCLUDES) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native") foreach(F ${PIP_FOLDERS}) - list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src/${F}") + list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src_main/${F}") endforeach(F) #message(${PIP_INCLUDES}) set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg") @@ -25,6 +25,7 @@ if(WIN32) endif() set(LIST_LIBS pip qad_utils qad_widgets qad_application qad_blockview qad_graphic qad_sql_table piqt cd_utils qcd_utils kx_utils piqt_utils touch_widgets qglview) +#set(LIST_LIBS pip) foreach(L ${LIST_LIBS}) add_subdirectory(${L}) include_directories(${L}) @@ -32,6 +33,8 @@ endforeach(L) if(WIN32) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR}) + foreach(PIP_LT ${PIP_LIBS_TARGETS}) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/lib${PIP_LT}.dll" DESTINATION ${QTDIR}) + endforeach() install(FILES "FindMinGW.cmake" DESTINATION ${CMAKE_ROOT}/Modules) endif() diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index 9539958..81d6422 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -35,7 +35,11 @@ target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/kx_utils/CMakeLists.txt b/kx_utils/CMakeLists.txt index f2e144f..27aa071 100644 --- a/kx_utils/CMakeLists.txt +++ b/kx_utils/CMakeLists.txt @@ -47,7 +47,11 @@ if (LIB) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index 6630321..05adae8 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -26,7 +26,11 @@ if(LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else() - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index e33de73..077d298 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -17,7 +17,7 @@ if(DEBUG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") endif() set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets qad_utils qad_blockview) -pip_code_model(CCM "../pip/src/io/piiodevice.h" "../pip/src/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es") +pip_code_model(CCM "../pip/src_main/io/piiodevice.h" "../pip/src_main/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es") #message(STATUS "pip_code_model for iodevice = ${CCM}") #message(STATUS "pip_INCLUDES = ${PIP_INCLUDES}") file(GLOB CPPS_UTILS "piqt_*.cpp") @@ -67,7 +67,11 @@ if(LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else() - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() diff --git a/qad_application/CMakeLists.txt b/qad_application/CMakeLists.txt index f6777be..6b40285 100644 --- a/qad_application/CMakeLists.txt +++ b/qad_application/CMakeLists.txt @@ -30,7 +30,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/qad_blockview/CMakeLists.txt b/qad_blockview/CMakeLists.txt index 563d534..fdeac33 100644 --- a/qad_blockview/CMakeLists.txt +++ b/qad_blockview/CMakeLists.txt @@ -34,7 +34,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/qad_graphic/CMakeLists.txt b/qad_graphic/CMakeLists.txt index b32b44e..718ee2c 100644 --- a/qad_graphic/CMakeLists.txt +++ b/qad_graphic/CMakeLists.txt @@ -31,7 +31,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/qad_sql_table/CMakeLists.txt b/qad_sql_table/CMakeLists.txt index 94632a3..0799bc7 100644 --- a/qad_sql_table/CMakeLists.txt +++ b/qad_sql_table/CMakeLists.txt @@ -30,7 +30,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/qad_utils/CMakeLists.txt b/qad_utils/CMakeLists.txt index 047c985..95515d1 100644 --- a/qad_utils/CMakeLists.txt +++ b/qad_utils/CMakeLists.txt @@ -30,7 +30,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/qad_utils/qpiconfig.h b/qad_utils/qpiconfig.h index cfe0081..d7dd7fd 100644 --- a/qad_utils/qpiconfig.h +++ b/qad_utils/qpiconfig.h @@ -149,7 +149,7 @@ public: bool isEntryExists(const QString & name) const {return entryExists(this, name);} const QString & stringValue() const {return _value;} - operator bool() {return (_value.toLower().trimmed() == "true" || _value.toInt() > 0);} + operator bool() {return (_value.toLower().trimmed() == "true" || _value.toLower().trimmed() == "yes" || _value.toLower().trimmed() == "on" || _value.toInt() > 0);} operator char() {return (_value.isEmpty() ? 0 : _value[0].toLatin1());} operator short() {return _value.toShort();} operator int() {return QString2int(_value);} diff --git a/qad_widgets/CMakeLists.txt b/qad_widgets/CMakeLists.txt index 64d9750..0a1d2f8 100644 --- a/qad_widgets/CMakeLists.txt +++ b/qad_widgets/CMakeLists.txt @@ -30,7 +30,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index 7b5d303..83174ea 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -41,7 +41,11 @@ endif () get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt index 51c2861..dbe4e7c 100644 --- a/qglview/CMakeLists.txt +++ b/qglview/CMakeLists.txt @@ -34,7 +34,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif () diff --git a/touch_widgets/CMakeLists.txt b/touch_widgets/CMakeLists.txt index b3eb3b7..2213e3f 100644 --- a/touch_widgets/CMakeLists.txt +++ b/touch_widgets/CMakeLists.txt @@ -30,7 +30,11 @@ if (LIB) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) else () - set(CMAKE_INSTALL_PREFIX /usr) + if(APPLE) + set(CMAKE_INSTALL_PREFIX /usr/local) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif ()