@@ -147,32 +147,32 @@ IF(BUILD_SWIG_BINDINGS) ADD_SUBDIRECTORY(lang/swig) ENDIF(BUILD_SWIG_BINDINGS) -# pkg-config (use the CPack information) -# FIND_PACKAGE(PkgConfig) -# if(PKG_CONFIG_EXECUTABLE) -# set(PC_SHORT_NAME "${BUILDSYS_CPACK_NAME}") -# set(PC_LONG_NAME "${BUILDSYS_CPACK_NAME}") -# set(PC_LIBRARY_NAME "${LIBNIFALCON_CPP}") -# set(PC_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") -# set(PC_VERSION "${LIBNIFALCON_MAJOR_VERSION}.${LIBNIFALCON_MINOR_VERSION}.${LIBNIFALCON_BUILD_VERSION}") - -# if(LIBUSB_1_FOUND) -# set(PC_REQUIRES "${PC_REQUIRES}libusb-1.0 ") -# set(PC_LINK_FLAGS "${PC_LINK_FLAGS}-lnifalcon_comm_libusb ") -# endif(LIBUSB_1_FOUND) - -# set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS} ${PC_LINK_FLAGS}") -# set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}") -# set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}") -# set(PC_CONFIGURED_FILE -# ${CMAKE_BINARY_DIR}/libnifalcon.pc -# ) -# MESSAGE("-- Generating ${PC_CONFIGURED_FILE}") -# configure_file( -# ${CMAKE_SOURCE_DIR}/libnifalcon.pc.cmake -# ${PC_CONFIGURED_FILE} -# @ONLY -# ) -# set(PKG_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -# install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR}) -# endif(PKG_CONFIG_EXECUTABLE) +#pkg-config (use the CPack information) +FIND_PACKAGE(PkgConfig) +if(PKG_CONFIG_EXECUTABLE) + set(PC_SHORT_NAME "${BUILDSYS_CPACK_NAME}") + set(PC_LONG_NAME "${BUILDSYS_CPACK_NAME}") + set(PC_LIBRARY_NAME "${LIBNIFALCON_CPP}") + set(PC_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}") + set(PC_VERSION "${LIBNIFALCON_MAJOR_VERSION}.${LIBNIFALCON_MINOR_VERSION}.${LIBNIFALCON_BUILD_VERSION}") + + if(LIBUSB_1_FOUND) + set(PC_REQUIRES "${PC_REQUIRES}libusb-1.0 ") + set(PC_LINK_FLAGS "${PC_LINK_FLAGS}-lnifalcon_comm_libusb ") + endif(LIBUSB_1_FOUND) + + set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS} ${PC_LINK_FLAGS}") + set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}") + set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}") + set(PC_CONFIGURED_FILE + ${CMAKE_BINARY_DIR}/libnifalcon.pc + ) + MESSAGE("-- Generating ${PC_CONFIGURED_FILE}") + configure_file( + ${CMAKE_SOURCE_DIR}/libnifalcon.pc.cmake + ${PC_CONFIGURED_FILE} + @ONLY + ) + set(PKG_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR}) +endif(PKG_CONFIG_EXECUTABLE) CMakeLists.txt 6668643d89c1b9f2a3812c5687ecf5e44688d803 Kyle Machulis kyle@nonpolynomial.com http://github.com/qdot/libnifalcon/commit/a35a252367ba5c59760163bc93635c10c73baa97 a35a252367ba5c59760163bc93635c10c73baa97 2009-10-11T20:25:55-07:00 2009-10-11T20:25:55-07:00 Readded pkgconfig block. 96c572e4199b95c93049cd9502076c077bf7838e Kyle Machulis kyle@nonpolynomial.com