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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-04 20:59:11 +00:00
parent ff1adc8cbb
commit ec968e9ad7
13 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -54,6 +54,7 @@ if (DEBUG)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
endif () endif ()
include(SDKMacros.cmake) include(SDKMacros.cmake)
set(CMAKE_CXX_STANDARD 11)
set(PIP_LIBRARY pip) set(PIP_LIBRARY pip)
set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt" "introspection" "concurrent") set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt" "introspection" "concurrent")
@@ -125,7 +126,10 @@ if (SomeQtFound)
add_subdirectory(qad) add_subdirectory(qad)
set(_DIRS piqt piqt_utils qcd_utils) set(_DIRS piqt piqt_utils qcd_utils)
if (QGLVIEW) if (QGLVIEW)
list(APPEND _DIRS qglview) if (Qt5)
#list(APPEND _DIRS qglview)
list(APPEND _DIRS qglengine)
endif()
else() else()
if (QGLENGINE) if (QGLENGINE)
list(APPEND _DIRS qglengine) list(APPEND _DIRS qglengine)

4
cd_utils/CMakeLists.txt
View File

@@ -50,7 +50,7 @@ if(NOT LIBPROJECT)
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()
@@ -66,5 +66,7 @@ if(LIB)
#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION bin)
install(TARGETS ${PROJECT_NAME} DESTINATION lib)
install(FILES ${HDRS_UTILS} DESTINATION include)
#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") #message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
endif() endif()

7
make_android.bat → cmake_android.bat
View File

@@ -1,12 +1,13 @@
@echo off @echo off
rem please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_HOME (path to android ndk directory) rem Please add to environment ANDROID_QT5_DIR (path to Qt directory) and ANDROID_NDK_HOME (path to android ndk directory)
rem execute with Android API version and arch e. g. : #make_android.bat 24 arm ../libs rem Execute with Android API version and arch e. g. : #cmake_android.bat 24 arm ../libs
rem Arches: arm, arm64, x86, x86_64
set _usage_=0 set _usage_=0
if [%~1]==[] set _usage_=1 if [%~1]==[] set _usage_=1
if [%~2]==[] set _usage_=1 if [%~2]==[] set _usage_=1
if [%~3]==[] set _usage_=1 if [%~3]==[] set _usage_=1
if %_usage_%==1 ( if %_usage_%==1 (
echo Usage: make_android.bat ^<API_LEVEL^> ^<ARCH^> ^<SRC^> echo Usage: cmake_android.bat ^<API_LEVEL^> ^<ARCH^> ^<SRC^>
echo ^ ^ ^<API_LEVEL^> - number of API ^(e.g. 19^) echo ^ ^ ^<API_LEVEL^> - number of API ^(e.g. 19^)
echo ^ ^ ^<ARCH^> - architecture ^(arm, arm64, x86, x86_64^) echo ^ ^ ^<ARCH^> - architecture ^(arm, arm64, x86, x86_64^)
echo ^ ^ ^<SRC^> - path to sources echo ^ ^ ^<SRC^> - path to sources

0
make_android.sh → cmake_android.sh
View File

4
kx_utils/CMakeLists.txt
View File

@@ -63,7 +63,9 @@ if (LIB)
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") install(TARGETS ${PROJECT_NAME} DESTINATION lib)
install(FILES ${HDRS_UTILS} DESTINATION include)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
if (NOT DEFINED ENV{QNX_HOST}) if (NOT DEFINED ENV{QNX_HOST})
if (KX_PULT) if (KX_PULT)

2
make_libs_android.bat
View File

@@ -1,6 +1,6 @@
@echo off @echo off
mkdir ..\libs_build_android_%~1 mkdir ..\libs_build_android_%~1
cd ..\libs_build_android_%~1 cd ..\libs_build_android_%~1
call ..\libs\make_android 21 %~1 ..\libs "-DUTILS=0 -DDEBUG=0 -DCMAKE_BUILD_TYPE=Release" call ..\libs\cmake_android 21 %~1 ..\libs "-DUTILS=0 -DDEBUG=0 -DCMAKE_BUILD_TYPE=Release"
call make install -j4 call make install -j4
cd ..\libs cd ..\libs

4
piqt/CMakeLists.txt
View File

@@ -41,6 +41,8 @@ else()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib)
install(FILES ${out_HDR} DESTINATION include/pip)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()

4
piqt_utils/CMakeLists.txt
View File

@@ -65,6 +65,8 @@ else()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib)
install(FILES ${out_HDR} DESTINATION include/pip)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()

6
qad/CMakeLists.txt
View File

@@ -47,7 +47,7 @@ if (NOT LIBPROJECT)
endif() endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()
@@ -85,6 +85,10 @@ macro(qad_install _TARGET _H_FILES _QM_FILES)
endif() endif()
else() else()
qt_install(TARGETS ${_TARGET} DESTINATION bin) qt_install(TARGETS ${_TARGET} DESTINATION bin)
qt_install(TARGETS ${_TARGET} DESTINATION lib)
if(NOT _H_FILES STREQUAL "")
install(FILES ${_H_FILES} DESTINATION include/qad)
endif()
endif() endif()
endif() endif()
endmacro() endmacro()

4
qcd_utils/CMakeLists.txt
View File

@@ -41,7 +41,9 @@ else()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib)
install(FILES ${out_HDR} DESTINATION include)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()

4
qglengine/CMakeLists.txt
View File

@@ -55,7 +55,9 @@ else()
message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS qglengine_core DESTINATION bin) qt_install(TARGETS qglengine_core DESTINATION bin)
message(STATUS "Install qglengine_core to local \"bin\"") qt_install(TARGETS qglengine_core DESTINATION lib)
qt_install(FILES ${out_HDR} DESTINATION include/qglengine)
message(STATUS "Install qglengine_core to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()
if (NOT DEFINED ANDROID_PLATFORM) if (NOT DEFINED ANDROID_PLATFORM)

4
qglengine/widgets/CMakeLists.txt
View File

@@ -29,6 +29,8 @@ else()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib)
qt_install(FILES ${H} DESTINATION include/qglengine)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()

4
qglview/CMakeLists.txt
View File

@@ -42,7 +42,9 @@ else()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else() else()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"") qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib)
qt_install(FILES ${H} DESTINATION include/qad)
message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
endif() endif()
endif() endif()
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})