SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@210 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2017-05-16 12:14:00 +00:00
parent c077c43f5e
commit 0e28c059cc
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
piqt/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ if(NOT LIBPROJECT)
if(DEBUG) if(DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif() endif()
include(QtProject)
endif() endif()
include(QtProject)
find_package(QAD REQUIRED) find_package(QAD REQUIRED)
include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY}) set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY})

3
qad/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
project(qad) project(qad)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
include(./QtProject.cmake) include(QtProject.cmake)
if (LIBPROJECT) if (LIBPROJECT)
include(../SDKMacros.cmake) include(../SDKMacros.cmake)
else() else()
@@ -10,7 +10,6 @@ else()
if (DEBUG) if (DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif () endif ()
set(QAD_STANDALONE 1)
endif() endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
if (MINGW) if (MINGW)

4
qad/FindQAD.cmake
View File

@@ -1,6 +1,4 @@
if(LIBPROJECT OR QAD_STANDALONE) if(NOT LIBPROJECT)
include(./QtProject.cmake)
else()
include(QtProject) include(QtProject)
endif() endif()
set(_SEARCH_DIR) set(_SEARCH_DIR)