From dc6331099b3dd4522c95356a43f102bd6f5ad843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 16 May 2017 11:30:25 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@205 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 2 +- qad/CMakeLists.txt | 5 ++--- QtProject.cmake => qad/QtProject.cmake | 0 3 files changed, 3 insertions(+), 4 deletions(-) rename QtProject.cmake => qad/QtProject.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3d1eda..9af58d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,6 @@ if(WIN32) foreach(PIP_LT ${PIP_LIBS_TARGETS}) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/lib${PIP_LT}.dll" DESTINATION ${QTDIR}) endforeach() - set(CMAKES "FindMinGW.cmake" "QtProject.cmake") + set(CMAKES "FindMinGW.cmake") install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) endif() diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 220fd17..977dff6 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -1,10 +1,9 @@ project(qad) cmake_minimum_required(VERSION 2.6) +include(QtProject.cmake) if (LIBPROJECT) include(../SDKMacros.cmake) - include(../QtProject.cmake) else() - include(QtProject) option(LIB "System install" 0) option(DEBUG "Build with -g3" 0) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall") @@ -35,7 +34,7 @@ if (NOT LIBPROJECT) message(STATUS "Install to local \"bin\"") endif () endif() -set(CMAKES "FindQAD.cmake") +set(CMAKES "FindQAD.cmake" "QtProject.cmake") install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) macro(qad_install _TARGET _H_FILES) diff --git a/QtProject.cmake b/qad/QtProject.cmake similarity index 100% rename from QtProject.cmake rename to qad/QtProject.cmake