diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f46d5a0b..69a7169be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -754,6 +754,7 @@ add_definitions( -DQT_NO_TRANSLATION ) +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" ) set( CMAKE_SHARED_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( EXPORT ${CMAKE_PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_DIR} ) +tde_install_export( ) diff --git a/khtml/java/dummy/CMakeLists.txt b/khtml/java/dummy/CMakeLists.txt index 59fc65eb4..e66bf26c6 100644 --- a/khtml/java/dummy/CMakeLists.txt +++ b/khtml/java/dummy/CMakeLists.txt @@ -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 ) -tde_add_library( ${target} SHARED +tde_add_library( kjava SHARED SOURCES dummy.cpp VERSION 1.0.0 DESTINATION ${LIB_INSTALL_DIR} diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 1a548e0fc..4b0b4eca3 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -24,6 +24,9 @@ add_subdirectory( misc ) add_subdirectory( kpasswdserver ) add_subdirectory( tests ) +include_directories( + ${TQT_INCLUDE_DIRS} +) link_directories( ${TQT_LIBRARY_DIRS}