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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-09 13:53:10 +00:00
parent 215691a5ed
commit 19fe0c750b
5 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -166,3 +166,15 @@ if(WIN32)
set(CMAKES "FindMinGW.cmake")
install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
endif()
#if (APPLE AND CMAKE_CROSSCOMPILING)
foreach(_T ${_ALL_TARGETS})
set_property(TARGET ${_T} PROPERTY _OUTPUT $<TARGET_FILE:${_T}>)
get_property(_TIP TARGET ${_T} PROPERTY _OUTPUT)
#message("${_T} -> ${_TIP}")
#execute_process(COMMAND "echo" "123")
#set(_TIP $<TARGET_FILE_NAME:${_T}>)
#install(CODE "MESSAGE(\"Sample install message.\")")
endforeach()
#endif()
message("${CMAKE_ABSOLUTE_DESTINATION_FILES}")

13
cd_utils/CMakeLists.txt
View File

@@ -27,6 +27,17 @@ else()
endif()
target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
# Apple crosscompiling rpath patch
if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)
foreach(_RP ${CMAKE_INSTALL_RPATH})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
"-add_rpath" "${_RP}"
"$<TARGET_FILE_DIR:${PROJECT_NAME}>/$<TARGET_FILE_NAME:${PROJECT_NAME}>"
COMMENT "Add to ${PROJECT_NAME} rpath \"${_RP}\"")
endforeach()
endif()
add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h")
target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME})
message(STATUS "Building ${PROJECT_NAME}")
@@ -55,6 +66,8 @@ if(NOT LIBPROJECT)
endif()
if(LIB)
list(APPEND _ALL_TARGETS ${PROJECT_NAME})
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
if(WIN32)
install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE})
install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})

2
kx_utils/CMakeLists.txt
View File

@@ -46,6 +46,8 @@ if (NOT DEFINED ENV{QNX_HOST})
endif()
endif()
if (LIB)
list(APPEND _ALL_TARGETS ${PROJECT_NAME})
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
if (WIN32)
set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE})

4
qad/CMakeLists.txt
View File

@@ -146,4 +146,6 @@ foreach(D ${DIRS})
include_directories(${D})
add_subdirectory(${D})
endforeach(D)
if (LIB)
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
endif()

28
qad/QtWraps.cmake
View File

@@ -365,6 +365,20 @@ macro(qt_add_executable _NAME)
### add_definitions(${Qt5Widgets_DEFINITIONS})
### target_compile_definitions(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
#message("add exe: \"${_TARGET}\", \"${_PREF}\"")
# Apple crosscompiling rpath patch
if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)
foreach(_RP ${CMAKE_INSTALL_RPATH})
add_custom_command(TARGET ${_TARGET} POST_BUILD
COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
"-add_rpath" "${_RP}"
"$<TARGET_FILE_DIR:${_TARGET}>/$<TARGET_FILE_NAME:${_TARGET}>"
COMMENT "Add to ${_TARGET} rpath \"${_RP}\"")
endforeach()
endif()
list(APPEND _ALL_TARGETS "${_TARGET}")
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
endif()
endforeach()
endmacro()
@@ -385,6 +399,20 @@ macro(qt_add_library _NAME)
set(_${_NAME}_is_qt 1)
target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
#message("add lib: \"${_TARGET}\"")
# Apple crosscompiling rpath patch
if (APPLE AND CMAKE_CROSSCOMPILING AND CMAKE_MACOSX_RPATH)
foreach(_RP ${CMAKE_INSTALL_RPATH})
add_custom_command(TARGET ${_TARGET} POST_BUILD
COMMAND "${CMAKE_INSTALL_NAME_TOOL}"
"-add_rpath" "${_RP}"
"$<TARGET_FILE_DIR:${_TARGET}>/$<TARGET_FILE_NAME:${_TARGET}>"
COMMENT "Add to ${_TARGET} rpath \"${_RP}\"")
endforeach()
endif()
list(APPEND _ALL_TARGETS "${_TARGET}")
set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
endif()
endforeach()
endmacro()