SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2016-01-20 08:41:52 +00:00
parent d88b341070
commit a574473f14
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

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

36
kx_tools/CMakeLists.txt
View File

@@ -5,6 +5,8 @@ if (NOT LIBPROJECT)
endif () endif ()
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES}) 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} -O2 -Wall")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -19,20 +21,22 @@ endif ()
target_link_libraries(kx_utils ${PIP_LIBRARY}) target_link_libraries(kx_utils ${PIP_LIBRARY})
if (NOT DEFINED ENV{QNX_HOST}) if (NOT DEFINED ENV{QNX_HOST})
find_package(Qt4 REQUIRED) if (${KX_PULT})
include_directories(${QT_INCLUDES}) find_package(Qt4 REQUIRED)
set(CPPS "kx_pult.cpp" "kx_pult.h" "kx_pult.ui" "main_kx_pult.cpp") include_directories(${QT_INCLUDES})
set(MOCS "kx_pult.h") set(CPPS "kx_pult.cpp" "kx_pult.h" "kx_pult.ui" "main_kx_pult.cpp")
file(GLOB UIS "*.ui") set(MOCS "kx_pult.h")
file(GLOB RES "*.qrc") file(GLOB UIS "*.ui")
qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw) file(GLOB RES "*.qrc")
qt4_wrap_ui(CUIS ${UIS}) qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
qt4_add_resources(RESS ${RES}) qt4_wrap_ui(CUIS ${UIS})
add_executable(kx_pult ${CPPS} ${CMOCS} ${CUIS} ${RESS}) qt4_add_resources(RESS ${RES})
set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets kx_utils) add_executable(kx_pult ${CPPS} ${CMOCS} ${CUIS} ${RESS})
find_package(OpenGL REQUIRED) set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets kx_utils)
list(APPEND LIBS ${OPENGL_LIBRARIES}) find_package(OpenGL REQUIRED)
target_link_libraries(kx_pult ${LIBS}) list(APPEND LIBS ${OPENGL_LIBRARIES})
target_link_libraries(kx_pult ${LIBS})
endif ()
endif () endif ()
if (DEFINED LIB) if (DEFINED LIB)
@@ -52,5 +56,7 @@ else ()
endif () endif ()
if (NOT DEFINED ENV{QNX_HOST}) if (NOT DEFINED ENV{QNX_HOST})
install(TARGETS kx_pult DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) if (${KX_PULT})
install(TARGETS kx_pult DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
endif ()
endif () endif ()

14
qad_utils/qpiconfig.cpp
View File

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