cmake: Embed modules to the target TQt library.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

src/CMakeLists.txt

@@ -52,21 +52,8 @@ tde_add_library( tqt3 SHARED
 
   SOURCES
         dummy.cpp
-  LINK
-      tools-static
-      kernel-static
-      codecs-static
-      styles-static
-      canvas-static
-      dialogs-static
-      inputmethod-static
-      table-static
-      widgets-static
-      workspace-static
-      xml-static
-      network-static
-      opengl-static
-      sql-static
+  EMBED
+     ${qtlib_embed}
 
   DESTINATION ${LIB_INSTALL_DIR}
 )

src/dialogs/CMakeLists.txt

@@ -34,7 +34,7 @@ tde_add_library( ${target} STATIC_PIC
   SOURCES
         ${_SRC_}
 
-  EMBED
+  LINK
       kernel-static
 
   DEPENDENCIES

src/kernel/CMakeLists.txt

@@ -166,6 +166,13 @@ tde_add_library( ${target} STATIC_PIC
   SOURCES
         ${_SRC_}
   LINK
+     tools-static
+     codecs-static
+     styles-static
+     dialogs-static
+     widgets-static
+     inputmethod-static
+     xml-static
      ${LIBICE_LIBRARIES}
      ${NAS_LIBRARIES}
      ${X11_X11_LIB}
@@ -185,15 +192,6 @@ tde_add_library( ${target} STATIC_PIC
      ${LIBFONTCONFIG_LIBRARIES}
      ${GLIB2_LIBRARIES}
 
-  EMBED
-      tools-static
-      codecs-static
-      styles-static
-      dialogs-static
-      widgets-static
-      inputmethod-static
-      xml-static
-
   DEPENDENCIES
     tqt-includes
 )

src/sql/CMakeLists.txt

@@ -43,13 +43,17 @@ set( _SRC_ qsqlquery.cpp
 
 if( WITH_PSQL )
     list( APPEND _SRC_ drivers/psql/qsql_psql.cpp )
- elseif ( WITH_MYSQL )
+endif()
+if ( WITH_MYSQL )
     list( APPEND _SRC_ drivers/mysql/qsql_mysql.cpp )
- elseif ( WITH_ODBC )
+endif()
+if( WITH_ODBC )
     list( APPEND _SRC_ drivers/odbc/qsql_odbc.cpp )
- elseif ( WITH_IBASE )
+endif()
+if( WITH_IBASE )
     list( APPEND _SRC_ drivers/ibase/qsql_ibase.cpp )
- elseif ( WITH_SQL3 )
+endif()
+if( WITH_SQL3 )
     list( APPEND _SRC_ drivers/sqlite3/qsql_sqlite3.cpp )
 endif()
 

src/styles/CMakeLists.txt

@@ -57,7 +57,7 @@ tde_add_library( ${target} STATIC_PIC
   SOURCES
         ${_SRC_}
 
-  EMBED
+  LINK
       kernel-static
 
   DEPENDENCIES

src/widgets/CMakeLists.txt

@@ -81,7 +81,7 @@ tde_add_library( ${target} STATIC_PIC
   SOURCES
         ${_SRC_}
 
-  EMBED
+  LINK
       styles-static
       workspace-static