Changeset View
Changeset View
Standalone View
Standalone View
head/devel/ucommon/files/patch-CMakeLists.txt
| Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines | |||||
| + if(${lib} STREQUAL "-pthread") | + if(${lib} STREQUAL "-pthread") | ||||
| + set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} ${slib}") | + set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} ${slib}") | ||||
| + else() | + else() | ||||
| + set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") | + set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") | ||||
| + endif() | + endif() | ||||
| endforeach() | endforeach() | ||||
| configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) | ||||
| configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config) | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config) | ||||
| @@ -594,11 +611,11 @@ | |||||
| endif() | |||||
| if(NOT WIN32) | |||||
| - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig) | |||||
| + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION libdata/pkgconfig) | |||||
| install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ucommon-config DESTINATION ${INSTALL_BINDIR}) | |||||
| if(BUILD_STDLIB) | |||||
| install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp-config DESTINATION ${INSTALL_BINDIR}) | |||||
| - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig) | |||||
| + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/commoncpp.pc DESTINATION libdata/pkgconfig) | |||||
| endif() | |||||
| endif(NOT WIN32) | |||||