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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2016-12-01 11:26:03 +00:00
parent 93c6199333
commit a325647edb
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(libs) project(libs)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
if (MINGW) if (MINGW)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif () endif ()
set(LIB 1) set(LIB 1)
@@ -11,14 +11,25 @@ set(CRYPT 1)
set(LIBPROJECT 1) set(LIBPROJECT 1)
set(PIP_LIBRARY pip) set(PIP_LIBRARY pip)
set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo") set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo")
set(PIP_INCLUDES)
foreach(F ${PIP_FOLDERS}) foreach(F ${PIP_FOLDERS})
set(PIP_INCLUDES ${PIP_INCLUDES} "../pip/src/${F}") list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src/${F}")
endforeach(F) endforeach(F)
#message(${PIP_INCLUDES})
set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg")
if (WIN32)
set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip")
string(REPLACE "/" "\\" PIP_DLL_DIR_W "${PIP_DLL_DIR}")
set(ENV{PATH} "$ENV{PATH}\;${PIP_DLL_DIR_W}")
#message($ENV{PATH})
endif()
set(LIST_LIBS pip qad_widgets qad_utils qad_application qad_blockview qad_graphic qad_sql_table piqt mbricks cd_utils kx_utils piqt_utils touch_widgets qglview) set(LIST_LIBS pip qad_widgets qad_utils qad_application qad_blockview qad_graphic qad_sql_table piqt mbricks cd_utils kx_utils piqt_utils touch_widgets qglview)
foreach(L ${LIST_LIBS}) foreach(L ${LIST_LIBS})
add_subdirectory(${L}) add_subdirectory(${L})
include_directories(${L}) include_directories(${L})
endforeach(L) endforeach(L)
if (WIN32) if (WIN32)
get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR}) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR})

18
piqt_utils/CMakeLists.txt
View File

@@ -1,16 +1,14 @@
project(piqt_utils) project(piqt_utils)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
find_package(Qt4 REQUIRED)
if (LIBPROJECT)
set(PIP_CMG ${CMAKE_CURRENT_BINARY_DIR}/../pip/utils/code_model_generator/pip_cmg.exe)
include(${CMAKE_CURRENT_SOURCE_DIR}/../pip/PIPMacros2.cmake)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../piqt)
else ()
find_package(PIP REQUIRED)
endif ()
if (MINGW) if (MINGW)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif() endif()
find_package(Qt4 REQUIRED)
if (LIBPROJECT)
include(PIPMacros)
else ()
find_package(PIP REQUIRED)
endif ()
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES} ${QT_INCLUDES}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES} ${QT_INCLUDES})
option(LIB "System install" 0) option(LIB "System install" 0)
option(DEBUG "Build with -g3" 0) option(DEBUG "Build with -g3" 0)
@@ -20,8 +18,8 @@ if (DEBUG)
endif () endif ()
set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets qad_utils qad_blockview) 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" OPTIONS "-DPIP_EXPORT" "-Es") pip_code_model(CCM "../pip/src/io/piiodevice.h" OPTIONS "-DPIP_EXPORT" "-Es")
message(STATUS "pip_code_model for iodevice = ${CCM}") #message(STATUS "pip_code_model for iodevice = ${CCM}")
message(STATUS "pip_INCLUDES = ${PIP_INCLUDES}") #message(STATUS "pip_INCLUDES = ${PIP_INCLUDES}")
file(GLOB CPPS_UTILS "piqt_*.cpp") file(GLOB CPPS_UTILS "piqt_*.cpp")
file(GLOB HDRS_UTILS "piqt_*.h") file(GLOB HDRS_UTILS "piqt_*.h")
file(GLOB UIS_UTILS "piqt_*.ui") file(GLOB UIS_UTILS "piqt_*.ui")