SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-04-20 23:02:07 +00:00
parent 2ec93af541
commit 526b6d4951
8 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -37,6 +37,7 @@ endif()
option(LIB "System install" 1)
option(DEBUG "Build with -g3" 0)
option(QGLVIEW "Build QGLview library and utils" 1)
option(UTILS "Build various utils" 1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
@@ -102,6 +103,12 @@ foreach(_v ${_QT_VERSIONS_})
endif()
endforeach()
if(UTILS)
message(STATUS "Building with utils")
else()
message(STATUS "Building only libraries")
endif()
add_subdirectory(pip)
set(_DIRS)
if (SomeQtFound)

4
make_android.bat
View File

@@ -38,8 +38,8 @@ set Qt5_ROOT=%ANDROID_QT5_DIR%\android_%QARCH%\lib\cmake
set Qt5_DIR=%Qt5_ROOT%\Qt5
if NOT [%QARCH%]==[] (
@echo on
cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -DQt5_DIR=%Qt5_ROOT%\Qt5 -DQt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools -DQt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin -DQt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets -DQt5Core_DIR=%Qt5_ROOT%\Qt5Core -DQt5Gui_DIR=%Qt5_ROOT%\Qt5Gui -DQt5Sql_DIR=%Qt5_ROOT%\Qt5Sql -DQt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script -DQt5Positioning_DIR=%Qt5_ROOT%\Qt5Positioning ..\libs
cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -DQt5_DIR=%Qt5_ROOT%\Qt5 -DQt5LinguistTools_DIR=%Qt5_ROOT%\Qt5LinguistTools -DQt5UiPlugin_DIR=%Qt5_ROOT%\Qt5UiPlugin -DQt5Widgets_DIR=%Qt5_ROOT%\Qt5Widgets -DQt5Core_DIR=%Qt5_ROOT%\Qt5Core -DQt5Gui_DIR=%Qt5_ROOT%\Qt5Gui -DQt5Sql_DIR=%Qt5_ROOT%\Qt5Sql -DQt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script -DQt5Positioning_DIR=%Qt5_ROOT%\Qt5Positioning ..\libs %~4 %~5 %~6
) else (
@echo on
cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=0 -DQGLVIEW=0 ..\libs
cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_HOME%\build\cmake\android.toolchain.cmake -DANDROID_STL=c++_shared -DANDROID_PLATFORM=android-%~1 -DANDROID_ABI=%AARCH% -DICU=0 -DQt4=0 -DQt5=0 -DQGLVIEW=0 ..\libs %~4 %~5 %~6
)

8
make_libs_android_all.bat Normal file
View File

@@ -0,0 +1,8 @@
@echo off
for %%a in (x86,arm,arm64) do (
mkdir ..\libs_build_android_%%a
cd ..\libs_build_android_%%a
..\libs\make_android 19 %%a ..\libs "-DUTILS=0"
make install -j4
cd ..\libs
)

10
piqt_utils/CMakeLists.txt
View File

@@ -3,9 +3,11 @@ cmake_minimum_required(VERSION 2.6)
if (POLICY CMP0017)
cmake_policy(SET CMP0017 NEW)
endif()
set(PIQT_UTILS_UTILS 1)
if(LIBPROJECT)
include(PIPMacros)
include(SDKMacros)
set(PIQT_UTILS_UTILS ${UTILS})
else()
find_package(PIP REQUIRED)
option(LIB "System install" 0)
@@ -40,9 +42,11 @@ if (LIBPROJECT)
endif()
if (NOT DEFINED ENV{QNX_HOST})
add_subdirectory(piconnedit)
add_subdirectory(pidumper)
add_subdirectory(piintrospector)
if (PIQT_UTILS_UTILS)
add_subdirectory(piconnedit)
add_subdirectory(pidumper)
add_subdirectory(piintrospector)
endif()
endif()
if(LIBPROJECT)

4
qad/CMakeLists.txt
View File

@@ -93,6 +93,10 @@ macro(qad_project NAME _MODULES _LIBS)
qt_add_library(${PROJ_NAME} SHARED out_CPP)
qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
qad_install(${PROJ_NAME} "${out_HDR}" ${PROJ_NAME}_QM)
set(${NAME}_UTILS 1)
if (LIBPROJECT)
set(${NAME}_UTILS ${UTILS})
endif()
message(STATUS "Building ${PROJ_NAME}")
if (NOT DEFINED ANDROID_PLATFORM)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")

4
qad/blockview/CMakeLists.txt
View File

@@ -1,2 +1,4 @@
qad_project(blockview "Gui;Widgets" "qad_utils;qad_widgets")
add_subdirectory(blockeditor)
if (blockview_UTILS)
add_subdirectory(blockeditor)
endif()

4
qad/graphic/CMakeLists.txt
View File

@@ -1,2 +1,4 @@
qad_project(graphic "Gui;Widgets;OpenGL" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
add_subdirectory(qpicalculator)
if (graphic_UTILS)
add_subdirectory(qpicalculator)
endif()

7
qcd_utils/CMakeLists.txt
View File

@@ -23,8 +23,10 @@ qt_add_library(${PROJECT_NAME} SHARED out_CPP)
qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_graphic cd_utils piqt)
message(STATUS "Building ${PROJECT_NAME}")
set(QCD_UTILS_UTILS 1)
if(LIBPROJECT)
sdk_install("" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")
set(QCD_UTILS_UTILS ${UTILS})
else()
if(LIB)
if(WIN32)
@@ -53,5 +55,6 @@ else()
endif()
endif()
add_subdirectory(pult)
if(QCD_UTILS_UTILS)
add_subdirectory(pult)
endif()