tree changes

qad/CMakeLists.txt

@@ -184,10 +184,6 @@ macro(qad_project NAME _MODULES _LIBS)
 	endif()
 	qt_target_link_libraries(${PROJ_NAME} ${_LIBS})
 	qad_install(${PROJ_NAME} "out_HDR" "out_QM")
-	set(${NAME}_UTILS 1)
-	if (LIBPROJECT)
-		set(${NAME}_UTILS ${UTILS})
-	endif()
 	message(STATUS "Building ${PROJ_NAME}")
 	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
 		set(_${NAME}_PLUGIN_LIBS "${_LIBS}")
@@ -195,15 +191,14 @@ macro(qad_project NAME _MODULES _LIBS)
 	endif()
 endmacro()
 
-set(DIRS utils widgets application blockview graphic sql_table touch_widgets doc)
-foreach(D ${DIRS})
-	list(APPEND QT_MULTILIB_LIST qad_${D})
-endforeach(D)
+add_subdirectory(libs)
+if (UTILS)
+	add_subdirectory(utils)
+endif()
+
 set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
-foreach(D ${DIRS})
-	include_directories(${D})
-	add_subdirectory(${D})
-endforeach(D)
+set(qad_includes ${qad_includes} PARENT_SCOPE)
 if (LIB)
 	set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
 endif()
+