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

This commit is contained in:
2019-04-23 09:54:35 +00:00
parent b80ba35992
commit f804ec5c83
6 changed files with 43 additions and 62 deletions

View File

@@ -32,7 +32,11 @@ if (DEFINED ANDROID_PLATFORM)
endif() endif()
set(INSTALL_PREFIX "") set(INSTALL_PREFIX "")
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/") if (DEFINED ANDROID_PLATFORM)
set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
else()
set(INSTALL_PREFIX "${CMAKE_STAGING_PREFIX}")
endif()
endif() endif()
option(LIB "System install" 1) option(LIB "System install" 1)
option(DEBUG "Build with -g3" 0) option(DEBUG "Build with -g3" 0)
@@ -52,9 +56,11 @@ set(PIP_LIBRARY pip)
set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt") set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt")
set(PIP_INCLUDES) set(PIP_INCLUDES)
if (LIB) if(LIB)
if(WIN32) if(WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) if(MINGW)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
endif()
else() else()
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local) set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
@@ -62,7 +68,11 @@ if (LIB)
if (DEFINED ANDROID_PLATFORM) if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else() else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr) if(CMAKE_CROSSCOMPILING)
set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
endif()
endif() endif()
endif() endif()
endif() endif()
@@ -75,7 +85,7 @@ foreach(F ${PIP_FOLDERS})
list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src_main/${F}") list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src_main/${F}")
endforeach(F) endforeach(F)
#message(${PIP_INCLUDES}) #message(${PIP_INCLUDES})
if(DEFINED ANDROID_PLATFORM) if(CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM))
set(PIP_CMG "pip_cmg") set(PIP_CMG "pip_cmg")
set(PIP_RC "pip_rc") set(PIP_RC "pip_rc")
else() else()

View File

@@ -29,27 +29,41 @@ target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h") add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h")
target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME}) target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME})
set(INSTALL_PREFIX "")
if(CMAKE_CROSSCOMPILING)
set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
endif()
message(STATUS "Building ${PROJECT_NAME}") message(STATUS "Building ${PROJECT_NAME}")
if(NOT LIBPROJECT)
if(LIB)
if(WIN32)
if(MINGW)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
endif()
else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
if(CMAKE_CROSSCOMPILING)
set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
endif()
endif()
endif()
endif()
message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
else()
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
endif()
endif()
if(LIB) if(LIB)
if(WIN32) if(WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE}) install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE})
install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
else() else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
endif()
endif()
install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()

View File

@@ -22,16 +22,11 @@ qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
qt_add_library(${PROJECT_NAME} SHARED out_CPP) qt_add_library(${PROJECT_NAME} SHARED out_CPP)
qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets) qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets)
message(STATUS "Building ${PROJECT_NAME}") message(STATUS "Building ${PROJECT_NAME}")
set(INSTALL_PREFIX "")
if(CMAKE_CROSSCOMPILING)
set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
endif()
if(LIBPROJECT) if(LIBPROJECT)
sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}") sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")
else() else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
if(NOT "x${out_QM}" STREQUAL "x") if(NOT "x${out_QM}" STREQUAL "x")
qt_install(FILES ${out_QM} DESTINATION QtLang) qt_install(FILES ${out_QM} DESTINATION QtLang)
@@ -40,15 +35,6 @@ else()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
else() else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX {ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
endif()
endif()
install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()

View File

@@ -54,21 +54,11 @@ if(LIBPROJECT)
else() else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
else() else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}$/usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}$/usr)
endif()
endif()
install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()

View File

@@ -30,21 +30,11 @@ if(LIBPROJECT)
else() else()
if(LIB) if(LIB)
if(WIN32) if(WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}) install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
else() else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX /usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
set(CMAKE_INSTALL_PREFIX /usr)
endif()
endif()
install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()

View File

@@ -36,15 +36,6 @@ else()
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin) qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
else() else()
if(APPLE)
set(CMAKE_INSTALL_PREFIX /usr/local)
else()
if (DEFINED ANDROID_PLATFORM)
set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
else()
set(CMAKE_INSTALL_PREFIX /usr)
endif()
endif()
qt_install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) qt_install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()