git-svn-id: svn://db.shs.com.ru/libs@76 a8b55f48-bf90-11e4-a774-851b48703e85

CMakeLists.txt

@@ -5,10 +5,10 @@ if (${WIN32})
 	find_package(MinGW REQUIRED)
 endif (${WIN32})
 find_package(Qt REQUIRED)
-set(LIB ON)
-set(USB ON)
-set(ICU ON)
-set(CRYPT ON)
+set(LIB 1)
+set(USB 1)
+set(ICU 1)
+set(CRYPT 1)
 set(LIBPROJECT 1)
 set(PIP_LIBRARY pip)
 set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code")

kx_tools/CMakeLists.txt

@@ -5,6 +5,8 @@ if (NOT LIBPROJECT)
 endif ()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES})
 
+option(KX_PULT "Build kx_pult" 1)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -19,6 +21,7 @@ endif ()
 target_link_libraries(kx_utils ${PIP_LIBRARY})
 
 if (NOT DEFINED ENV{QNX_HOST})
+	if (${KX_PULT})
 		find_package(Qt4 REQUIRED)
 		include_directories(${QT_INCLUDES})
 		set(CPPS "kx_pult.cpp" "kx_pult.h" "kx_pult.ui" "main_kx_pult.cpp")
@@ -34,6 +37,7 @@ if (NOT DEFINED ENV{QNX_HOST})
 		list(APPEND LIBS ${OPENGL_LIBRARIES})
 		target_link_libraries(kx_pult ${LIBS})
 	endif ()
+endif ()
 
 if (DEFINED LIB)
 	set(LIB 1)
@@ -52,5 +56,7 @@ else ()
 endif ()
 
 if (NOT DEFINED ENV{QNX_HOST})
+	if (${KX_PULT})
 		install(TARGETS kx_pult DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 	endif ()
+endif ()

qad_utils/qpiconfig.cpp

@@ -565,6 +565,8 @@ void QPIConfig::writeAll() {
 	//writeEntry(&root);
 	buildFullNames(&root);
 	Branch b = allLeaves();
+	QString prefix, tprefix;
+	bool isPrefix;
 	int j = 0;
 	for (int i = 0; i < other.size(); ++i) {
 		//cout << j << endl;
@@ -575,10 +577,22 @@ void QPIConfig::writeAll() {
 				++j;
 			} else {
 				stream << other[i];
+				tprefix = getPrefixFromLine(other[i], &isPrefix);
+				if (isPrefix) {
+					prefix = tprefix;
+					if (!prefix.isEmpty())
+						prefix += delim;
+				}
 				if (i < other.size() - 1) stream << '\n';
 			}
 		} else {
 			stream << other[i];
+			tprefix = getPrefixFromLine(other[i], &isPrefix);
+			if (isPrefix) {
+				prefix = tprefix;
+				if (!prefix.isEmpty())
+					prefix += delim;
+			}
 			if (i < other.size() - 1) stream << '\n';
 		}
 	}