merged to PIP 1.99.3

CMakeLists.txt

@@ -77,7 +77,6 @@ endif()
 set(CMAKE_CXX_STANDARD 11)
 
 set(PIP_LIBRARY pip)
-set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt" "introspection" "concurrent" "cloud")
 set(PIP_INCLUDES)
 
 if(LIB)
@@ -101,9 +100,6 @@ else()
 	message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 endif()
 
-foreach(F ${PIP_FOLDERS})
-	list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/lib/main/${F}")
-endforeach(F)
 #message(${PIP_INCLUDES})
 if(CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM))
 	set(PIP_CMG "pip_cmg")
@@ -150,6 +146,9 @@ else()
 	endif()
 
 	add_subdirectory(pip)
+	foreach(F ${PIP_MAIN_FOLDERS})
+		list(APPEND PIP_INCLUDES "${F}")
+	endforeach(F)
 	set(_DIRS)
 	if (SomeQtFound)
 		message(STATUS "Building Qt-derived targets for ${QtVersions}")