tree changes

CMakeLists.txt

@@ -21,6 +21,8 @@ endif()
 set(_COMPANY  SHS)
 set(_DOMAIN   org.SHS)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qad)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/piqt)
 if(MINGW)
 	find_package(MinGW REQUIRED)
 else()
@@ -115,6 +117,7 @@ if(WIN32)
 endif()
 
 set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad)
+set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (CROSSTOOLS)
 
@@ -154,9 +157,10 @@ else()
 		message(STATUS "Building Qt-derived targets for ${QtVersions}")
 		add_subdirectory(qad)
 		include_directories(${qad_includes})
-		set(_DIRS piqt piqt_utils qcd_utils)
+		add_subdirectory(piqt)
+		include_directories(${piqt_includes})
+		set(_DIRS)
 		if (Qt5)
-			list(APPEND _DIRS)
 			if (QGLVIEW)
 				list(APPEND _DIRS qglview)
 			endif()
@@ -166,16 +170,11 @@ else()
 		endif()
 		foreach(_D ${_DIRS})
 			list(APPEND QT_MULTILIB_LIST ${_D})
+			add_subdirectory(${_D})
 		endforeach(_D)
-		include_directories(piqt)
 	else()
 		message(STATUS "None of Qt found, skip Qt-derived targets")
 	endif()
-	include_directories(cd_utils)
-	list(INSERT _DIRS 0 cd_utils)
-	foreach(_D ${_DIRS})
-		add_subdirectory(${_D})
-	endforeach(_D)
 
 endif()