version 1.22.0
source tree changed detached PIConsole and PIScreen* in "pip_console" library
This commit is contained in:
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.0)
|
||||
cmake_policy(SET CMP0017 NEW) # need include() with .cmake
|
||||
project(pip)
|
||||
set(_PIP_MAJOR 1)
|
||||
set(_PIP_MINOR 21)
|
||||
set(_PIP_MINOR 22)
|
||||
set(_PIP_REVISION 0)
|
||||
set(_PIP_SUFFIX beta)
|
||||
set(_PIP_SUFFIX )
|
||||
set(_PIP_COMPANY SHS)
|
||||
set(_PIP_DOMAIN org.SHS)
|
||||
|
||||
@@ -57,16 +57,27 @@ macro(gather_src DIR CPP H H_P)
|
||||
list(APPEND ${H_P} ${PHS})
|
||||
endmacro()
|
||||
|
||||
set(PIP_SRC_MAIN "src_main")
|
||||
set(PIP_SRC_CRYPT "src_crypt")
|
||||
set(PIP_SRC_COMPRESS "src_compress")
|
||||
set(PIP_SRC_USB "src_usb")
|
||||
set(PIP_SRC_FFTW "src_fftw")
|
||||
set(PIP_SRC_OPENCL "src_opencl")
|
||||
set(PIP_SRC_IO_UTILS "src_io_utils")
|
||||
set(PIP_SRC_CONCURRENT "src_concurrent")
|
||||
set(PIP_SRC_CLOUD "src_cloud")
|
||||
set(PIP_SRC_DIRS "src_main" "src_crypt" "src_compress" "src_usb" "src_fftw" "src_opencl" "src_io_utils" "src_concurrent" "src_cloud")
|
||||
set(PIP_SRC_MAIN "lib/main")
|
||||
set(PIP_SRC_CONSOLE "lib/console")
|
||||
set(PIP_SRC_CRYPT "lib/crypt")
|
||||
set(PIP_SRC_COMPRESS "lib/compress")
|
||||
set(PIP_SRC_USB "lib/usb")
|
||||
set(PIP_SRC_FFTW "lib/fftw")
|
||||
set(PIP_SRC_OPENCL "lib/opencl")
|
||||
set(PIP_SRC_IO_UTILS "lib/io_utils")
|
||||
set(PIP_SRC_CONCURRENT "lib/concurrent")
|
||||
set(PIP_SRC_CLOUD "lib/cloud")
|
||||
set(PIP_SRC_DIRS ${PIP_SRC_MAIN}
|
||||
${PIP_SRC_CONSOLE}
|
||||
${PIP_SRC_CRYPT}
|
||||
${PIP_SRC_COMPRESS}
|
||||
${PIP_SRC_USB}
|
||||
${PIP_SRC_FFTW}
|
||||
${PIP_SRC_OPENCL}
|
||||
${PIP_SRC_IO_UTILS}
|
||||
${PIP_SRC_CONCURRENT}
|
||||
${PIP_SRC_CLOUD}
|
||||
)
|
||||
set(PIP_LIBS_TARGETS pip)
|
||||
set(LIBS_MAIN)
|
||||
set(LIBS_STATUS)
|
||||
@@ -178,6 +189,9 @@ endforeach(F)
|
||||
# Crypt lib
|
||||
gather_src("${PIP_SRC_CRYPT}" CPP_LIB_CRYPT HDRS PHDRS)
|
||||
|
||||
# Console lib
|
||||
gather_src("${PIP_SRC_CONSOLE}" CPP_LIB_CONSOLE HDRS PHDRS)
|
||||
|
||||
# Compress lib
|
||||
gather_src("${PIP_SRC_COMPRESS}" CPP_LIB_COMPRESS HDRS PHDRS)
|
||||
|
||||
@@ -400,6 +414,19 @@ if (NOT CROSSTOOLS)
|
||||
endif()
|
||||
|
||||
|
||||
# Add console library
|
||||
import_version(pip_console pip)
|
||||
set_deploy_property(pip_console ${PIP_LIB_TYPE}
|
||||
LABEL "PIP console support"
|
||||
FULLNAME "${_PIP_DOMAIN}.pip_console"
|
||||
COMPANY "${_PIP_COMPANY}"
|
||||
INFO "Platform-Independent Primitives")
|
||||
make_rc(pip_console _RC)
|
||||
add_library(pip_console ${PIP_LIB_TYPE} ${CPP_LIB_CONSOLE} ${_RC})
|
||||
target_link_libraries(pip_console pip)
|
||||
list(APPEND PIP_LIBS_TARGETS pip_console)
|
||||
|
||||
|
||||
# Check if PIP support cryptographic encryption/decryption using sodium library
|
||||
find_library(sodium_FOUND sodium)
|
||||
if(sodium_FOUND)
|
||||
@@ -517,7 +544,7 @@ if (NOT CROSSTOOLS)
|
||||
include_directories(${OpenCL_INCLUDE_DIRS})
|
||||
endif()
|
||||
add_definitions(-DPIP_OPENCL)
|
||||
pip_resources(CL_RES "src_opencl/resources.conf")
|
||||
pip_resources(CL_RES "${PIP_SRC_OPENCL}/resources.conf")
|
||||
add_library(pip_opencl ${PIP_LIB_TYPE} ${CPP_LIB_OPENCL} ${CL_RES} ${_RC})
|
||||
add_dependencies(pip_opencl pip_rc)
|
||||
if(${CMAKE_VERSION} VERSION_LESS "3.7.0")
|
||||
|
||||
Reference in New Issue
Block a user