diff options
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 17c76ea..00b2562 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# project( dbus-tqt-1 ) +set( VERSION "0.7" ) ##### cmake setup ############################### @@ -41,11 +42,16 @@ install( FILES ##### write pkgconfig file ###################### -# string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} ) -# string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} ) -# string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} ) -# configure_file( dbus-tqt.pc.cmake dbus-tqt.pc @ONLY ) -# install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dbus-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} ) +string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} ) +string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} ) +string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} ) + +foreach( _lib ${PROJECT_NAME} ${DBUS_LIBRARIES} ) + set( PC_LIBRARIES "${PC_LIBRARIES} -l${_lib}" ) +endforeach( ) + +configure_file( dbus-tqt.pc.cmake dbus-tqt.pc @ONLY ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dbus-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} ) ##### build setup ############################### diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a172249..951e55f 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -15,8 +15,5 @@ if( NOT DBUS_FOUND ) tde_message_fatal( "dbus-1 is required, but was not found on your system" ) endif( ) -# qt3 -find_package( Qt ) - # tqt find_package( TQt ) |