[kdelibs] added "-include tqt.h" to CMAKE_CXX_FLAGS; using new export mechanism

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212368 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
samelian 14 years ago
parent 0951e055d4
commit 307136d8ee

@ -754,6 +754,7 @@ add_definitions(
-DQT_NO_TRANSLATION -DQT_NO_TRANSLATION
) )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" )
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
@ -819,4 +820,4 @@ add_subdirectory( mimetypes )
##### install import cmake modules ############### ##### install import cmake modules ###############
install( EXPORT ${CMAKE_PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_DIR} ) tde_install_export( )

@ -9,13 +9,15 @@
# #
################################################# #################################################
##### kjava ##################################### include_directories(
${TQT_INCLUDE_DIRS}
)
set( target kjava ) ##### kjava #####################################
configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
tde_add_library( ${target} SHARED tde_add_library( kjava SHARED
SOURCES dummy.cpp SOURCES dummy.cpp
VERSION 1.0.0 VERSION 1.0.0
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}

@ -24,6 +24,9 @@ add_subdirectory( misc )
add_subdirectory( kpasswdserver ) add_subdirectory( kpasswdserver )
add_subdirectory( tests ) add_subdirectory( tests )
include_directories(
${TQT_INCLUDE_DIRS}
)
link_directories( link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}

Loading…
Cancel
Save