diff --git a/CMakeLists.txt b/CMakeLists.txt index c797da2..36cd0d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,19 @@ cmake_minimum_required(VERSION 2.6) +if (POLICY CMP0011) + cmake_policy(SET CMP0011 OLD) +endif() +if (POLICY CMP0017) + cmake_policy(SET CMP0017 OLD) +endif() +if (POLICY CMP0053) + cmake_policy(SET CMP0053 OLD) +endif() +if(POLICY CMP0020) + cmake_policy(SET CMP0020 OLD) +endif() project(libs) set(LIBPROJECT 1) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/") -#cmake_policy(SET CMP0017 OLD) if(MINGW) find_package(MinGW REQUIRED) endif() diff --git a/FindMinGW.cmake b/FindMinGW.cmake index c113171..023de89 100644 --- a/FindMinGW.cmake +++ b/FindMinGW.cmake @@ -1,6 +1,6 @@ if(${MINGW}) if(NOT DEFINED MINGW_DIR) - get_filename_component(MINGW_BIN ${CMAKE_C_COMPILER} PATH) + get_filename_component(MINGW_BIN ${CMAKE_CXX_COMPILER} PATH) get_filename_component(MINGW_DIR ${MINGW_BIN} PATH) find_path(MINGW_INCLUDE windows.h diff --git a/clean.bat b/clean.bat deleted file mode 100644 index 3f51316..0000000 --- a/clean.bat +++ /dev/null @@ -1,5 +0,0 @@ -#make clean -del /q /f /s CMakeFiles -rmdir /q /s CMakeFiles -del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *.user* *~ *cxx moc_* ui_* qrc_* *.o *.exe *.a *.dll *.lib core -for %%i in (pip mbricks piqt piqt_utils qad_widgets qad_utils qad_graphic qad_sql_table qad_application touch_widgets qglview kx_utils qad_blockview) do cd %%i && call clean.bat && cd .. diff --git a/clean_all b/clean_all deleted file mode 100755 index ec0398c..0000000 --- a/clean_all +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash -make clean -for i in $( ls -1 ); do - if [ "`ls -1d --file-type $i | grep -o /`" = "/" ]; then - echo -e "\e[32mcleaning $i ...\e[0m" - cd $i - rm -rvf ./CMakeFiles - rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./ui_* ./qrc_* ./*.o ./core - sh ./clean - cd ../ - echo -e "\e[32m$i cleaned\e[0m" - fi -done -rm -rvf ./CMakeFiles -rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./ui_* ./qrc_* ./*.o ./core -echo -e "\e[1;32mclean done\e[0m" diff --git a/make_libs.bat b/make_libs.bat index aa85688..26998dc 100644 --- a/make_libs.bat +++ b/make_libs.bat @@ -1,3 +1,3 @@ @echo off mkdir ..\libs_build_win -cd ../libs_build_win && cmake_mgw ../libs && make install -j8 && cd ../libs && pause +cd ../libs_build_win && cmake_mgw ../libs && cmake_mgw ../libs && make install -j8 && cd ../libs && pause diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index a28b87b..c741f01 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -1,6 +1,6 @@ project(piqt) cmake_minimum_required(VERSION 2.6) -#cmake_policy(SET CMP0017 OLD) +cmake_policy(SET CMP0017 OLD) if(NOT LIBPROJECT) find_package(PIP REQUIRED) option(LIB "System install" 0) diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index 1916569..e0e1344 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -1,6 +1,6 @@ project(piqt_utils) cmake_minimum_required(VERSION 2.6) -#cmake_policy(SET CMP0017 OLD) +cmake_policy(SET CMP0017 OLD) if(LIBPROJECT) include(PIPMacros) include(SDKMacros) diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index 2a85813..f04d670 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -1,6 +1,6 @@ project(qcd_utils) cmake_minimum_required(VERSION 2.6) -#cmake_policy(SET CMP0017 OLD) +cmake_policy(SET CMP0017 OLD) if (NOT LIBPROJECT) find_package(PIP REQUIRED) option(LIB "System install" 0) diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt index ab10cbd..3bc9b83 100644 --- a/qglview/CMakeLists.txt +++ b/qglview/CMakeLists.txt @@ -17,10 +17,11 @@ endif() find_package(QAD REQUIRED) find_package(OpenGL REQUIRED) include_directories(${QAD_INCLUDES}) -qt_project(${PROJECT_NAME} H CPP) -add_library(${PROJECT_NAME} SHARED ${H} ${CPP}) -set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} ${OPENGL_LIBRARIES} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY}) -target_link_libraries(${PROJECT_NAME} ${LIBS}) +file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") +find_qt(Qt4 Core Gui OpenGL Xml) +qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) +qt_add_library(${PROJECT_NAME} SHARED out_CPP) +qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets ${OPENGL_LIBRARIES}) message(STATUS "Building ${PROJECT_NAME}") if (LIBPROJECT) sdk_install("qad" "${PROJECT_NAME}" "${H}") @@ -51,5 +52,5 @@ endif() qt4_wrap_cpp(CMOCS_TEST "qglview_window.h" OPTIONS -nw) qt4_wrap_ui(CUIS_TEST "qglview_window.ui") -add_executable(qglview_test "main.cpp" "qglview_window.cpp" ${CMOCS_TEST} ${CUIS_TEST} ${CRES}) -target_link_libraries(qglview_test ${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +qt_add_executable(qglview_test "main.cpp" "qglview_window.cpp" ${CMOCS_TEST} ${CUIS_TEST} ${CRES}) +qt_target_link_libraries(qglview_test ${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) diff --git a/telegram_bot/main.cpp b/telegram_bot/main.cpp index db317a9..033a1c3 100644 --- a/telegram_bot/main.cpp +++ b/telegram_bot/main.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" +//#include "mainwindow.h" #include "execbot.h" #include diff --git a/telegram_bot/telegrambotbase.cpp b/telegram_bot/telegrambotbase.cpp index fe0f5e8..bf7da80 100644 --- a/telegram_bot/telegrambotbase.cpp +++ b/telegram_bot/telegrambotbase.cpp @@ -1,6 +1,6 @@ #include "telegrambotbase.h" #include -#include +#include TelegramBotBase::TelegramBotBase(QObject *parent) : QObject(parent) { // connect(&api, SIGNAL(newMessage(TelegramBotAPI::Message)), this, SLOT(processMessage(TelegramBotAPI::Message)), Qt::QueuedConnection);