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

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

Browse Source
This commit is contained in:
Бычков Андрей
2017-05-16 12:06:39 +00:00
parent 15048f93de
commit d81548aae7
8 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -22,19 +22,19 @@ set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math"
set(PIP_INCLUDES) set(PIP_INCLUDES)
if (LIB) if (LIB)
if (WIN32) if(WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
else () else()
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_PREFIX /usr/local) set(CMAKE_INSTALL_PREFIX /usr/local)
else() else()
set(CMAKE_INSTALL_PREFIX /usr) set(CMAKE_INSTALL_PREFIX /usr)
endif() endif()
endif () endif()
message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
else () else()
message(STATUS "Install to local \"bin\"") message(STATUS "Install to local \"bin\"")
endif () endif()
foreach(F ${PIP_FOLDERS}) 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}")

14
SDKMacros.cmake
View File

@@ -1,8 +1,8 @@
macro(sdk_install _DIR _TARGET _H_FILES) macro(sdk_install _DIR _TARGET _H_FILES)
if (LIB) if LIB)
if (WIN32) if(WIN32)
if (NOT _H_FILES STREQUAL "") if(NOT _H_FILES STREQUAL "")
#message("HFILES ${_H_FILES}") #message("HFILES ${_H_FILES}")
install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR}) install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR})
endif() endif()
@@ -10,13 +10,13 @@ macro(sdk_install _DIR _TARGET _H_FILES)
install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
install(TARGETS ${_TARGET} DESTINATION ${QTDIR}) install(TARGETS ${_TARGET} DESTINATION ${QTDIR})
else () else()
if (NOT _H_FILES STREQUAL "") if (NOT _H_FILES STREQUAL "")
install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR}) install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR})
endif() endif()
install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif () endif()
else () else()
install(TARGETS ${_TARGET} DESTINATION bin) install(TARGETS ${_TARGET} DESTINATION bin)
endif () endif()
endmacro() endmacro()

10
cd_utils/CMakeLists.txt
View File

@@ -7,8 +7,8 @@ if (NOT LIBPROJECT)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
if (DEBUG) if (DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif () endif()
endif () endif()
if (MINGW) if (MINGW)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif() endif()
@@ -19,9 +19,9 @@ set(CPPS_UTILS "cdutils_core.cpp" "cdutils_types.cpp" "cdutils_parser.cpp" "cdut
set(HDRS_UTILS "cdutils_core.h" "cdutils_types.h" "cdutils_parser.h" "cdutils_k.h" "cdutils_protocol.h") set(HDRS_UTILS "cdutils_core.h" "cdutils_types.h" "cdutils_parser.h" "cdutils_k.h" "cdutils_protocol.h")
if (DEFINED ENV{QNX_HOST}) if (DEFINED ENV{QNX_HOST})
add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS} ${HDRS_UTILS}) add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS} ${HDRS_UTILS})
else () else()
add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS} ${HDRS_UTILS}) add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS} ${HDRS_UTILS})
endif () endif()
target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY}) target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h") add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h")
@@ -51,4 +51,4 @@ else()
install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install to local \"bin\"") message(STATUS "Install to local \"bin\"")
endif() endif()
endif () endif()

22
kx_utils/CMakeLists.txt
View File

@@ -14,14 +14,14 @@ option(DEBUG "Build with -g3" 0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
if (DEBUG) if (DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif () endif()
set(CPPS_UTILS "kx_coeffs.cpp") set(CPPS_UTILS "kx_coeffs.cpp")
set(HDRS_UTILS "kx_coeffs.h" "kx_protocol_x.h" "kx_protocol_c.h") set(HDRS_UTILS "kx_coeffs.h" "kx_protocol_x.h" "kx_protocol_c.h")
if (DEFINED ENV{QNX_HOST}) if (DEFINED ENV{QNX_HOST})
add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS}) add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS})
else () else()
add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS}) add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS})
endif () endif()
target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY}) target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
message(STATUS "Building ${PROJECT_NAME}") message(STATUS "Building ${PROJECT_NAME}")
if (NOT DEFINED ENV{QNX_HOST}) if (NOT DEFINED ENV{QNX_HOST})
@@ -39,15 +39,15 @@ if (NOT DEFINED ENV{QNX_HOST})
add_executable(${KX_PULT_NAME} WIN32 ${CPPS} ${CMOCS} ${CUIS} ${RESS} ${MOCS}) add_executable(${KX_PULT_NAME} WIN32 ${CPPS} ${CMOCS} ${CUIS} ${RESS} ${MOCS})
set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets) set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets)
target_link_libraries(${KX_PULT_NAME} ${LIBS} ${PROJECT_NAME}) target_link_libraries(${KX_PULT_NAME} ${LIBS} ${PROJECT_NAME})
endif () endif()
endif () endif()
if (LIB) if (LIB)
if (WIN32) if (WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) 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) if(APPLE)
set(CMAKE_INSTALL_PREFIX /usr/local) set(CMAKE_INSTALL_PREFIX /usr/local)
else() else()
@@ -55,14 +55,14 @@ if (LIB)
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()
message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
else () else()
install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install to local \"bin\"") message(STATUS "Install to local \"bin\"")
endif () endif()
if (NOT DEFINED ENV{QNX_HOST}) if (NOT DEFINED ENV{QNX_HOST})
if (KX_PULT) if (KX_PULT)
install(TARGETS ${KX_PULT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS ${KX_PULT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
endif () endif()
endif () endif()

21
qad/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
project(qad) project(qad)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
include(./QtProject.cmake) include(QtProject.cmake)
if (LIBPROJECT) if (LIBPROJECT)
include(../SDKMacros.cmake) include(../SDKMacros.cmake)
else() else()
@@ -10,6 +10,7 @@ else()
if (DEBUG) if (DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif () endif ()
set(QAD_STANDALONE 1)
endif() endif()
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
if (MINGW) if (MINGW)
@@ -22,17 +23,17 @@ if (NOT LIBPROJECT)
if (LIB) if (LIB)
if (WIN32) if (WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR}) set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
else () else()
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_PREFIX /usr/local) set(CMAKE_INSTALL_PREFIX /usr/local)
else() else()
set(CMAKE_INSTALL_PREFIX /usr) set(CMAKE_INSTALL_PREFIX /usr)
endif() endif()
endif () endif()
message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
else () else()
message(STATUS "Install to local \"bin\"") message(STATUS "Install to local \"bin\"")
endif () endif()
endif() endif()
set(CMAKES "FindQAD.cmake" "QtProject.cmake") set(CMAKES "FindQAD.cmake" "QtProject.cmake")
install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
@@ -51,15 +52,15 @@ macro(qad_install _TARGET _H_FILES)
install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN}) install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
install(TARGETS ${_TARGET} DESTINATION ${QTDIR}) install(TARGETS ${_TARGET} DESTINATION ${QTDIR})
else () else()
if (NOT _H_FILES STREQUAL "") if(NOT _H_FILES STREQUAL "")
install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
endif() endif()
install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif () endif()
else () else()
install(TARGETS ${_TARGET} DESTINATION bin) install(TARGETS ${_TARGET} DESTINATION bin)
endif () endif()
endif() endif()
endmacro() endmacro()

6
qad/FindQAD.cmake
View File

@@ -1,4 +1,8 @@
include(QtProject) if(LIBPROJECT OR QAD_STANDALONE)
include(QtProject.cmake)
else()
endif()
set(_SEARCH_DIR) set(_SEARCH_DIR)
if(WIN32) if(WIN32)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)

2
qcd_utils/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ if (NOT LIBPROJECT)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
if (DEBUG) if (DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif () endif()
endif() endif()
find_package(QAD REQUIRED) find_package(QAD REQUIRED)
include_directories(${PIP_INCLUDES} ${QAD_INCLUDES}) include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})

14
qglview/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
if (DEBUG) if (DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif () endif()
endif () endif()
if (MINGW) if (MINGW)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif() endif()
@@ -30,7 +30,7 @@ else()
install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN}) install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR}) install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
else () else()
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_PREFIX /usr/local) set(CMAKE_INSTALL_PREFIX /usr/local)
else() else()
@@ -38,13 +38,13 @@ else()
endif() endif()
install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif () endif()
message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"") message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
else () else()
install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(TARGETS ${PROJECT_NAME} DESTINATION bin)
message(STATUS "Install to local \"bin\"") message(STATUS "Install to local \"bin\"")
endif () endif()
endif () endif()
qt4_wrap_cpp(CMOCS_TEST "qglview_window.h" OPTIONS -nw) qt4_wrap_cpp(CMOCS_TEST "qglview_window.h" OPTIONS -nw)
qt4_wrap_ui(CUIS_TEST "qglview_window.ui") qt4_wrap_ui(CUIS_TEST "qglview_window.ui")