SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

FindPIP fixes

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@61 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-04-03 07:12:23 +00:00
parent 617bddfe2a
commit 5f9a81132c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FindPIP.cmake
View File

@@ -45,7 +45,7 @@ macro (pip_code_model SRC RESULT)
endif () endif ()
endif () endif ()
endforeach() endforeach()
#message(STATUS "src = ${SRC}") #message(STATUS "src = ${CMAKE_CURRENT_SOURCE_DIR}/${SRC}")
#message(STATUS "result = ${RESULT}") #message(STATUS "result = ${RESULT}")
#message(STATUS "options = ${OPTIONS}") #message(STATUS "options = ${OPTIONS}")
set(NEED_PARSE FALSE CACHE BOOL "NEED_PARSE" FORCE) set(NEED_PARSE FALSE CACHE BOOL "NEED_PARSE" FORCE)
@@ -64,10 +64,15 @@ macro (pip_code_model SRC RESULT)
set(NEED_PARSE TRUE) set(NEED_PARSE TRUE)
#message(STATUS "NEW cache") #message(STATUS "NEW cache")
endif () endif ()
set(${RESULT} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm.cpp)
#message(STATUS "Res = ${${RESULT}}")
if (NOT EXISTS ${${RESULT}})
set(NEED_PARSE TRUE)
endif ()
if (NEED_PARSE) if (NEED_PARSE)
message(STATUS "Creating code model based on \"${SRC}\", please wait ... ") message(STATUS "Creating code model based on \"${SRC}\", please wait ... ")
#message(STATUS "exec \"-qP ${OPTIONS} -o ${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${SRC}\"") #message(STATUS "exec \"-qP ${OPTIONS} -o ${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${SRC}\"")
execute_process(COMMAND ${PIP_CMG} -qP ${OPTIONS} -o ${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${SRC} OUTPUT_VARIABLE CMG_OUT) execute_process(COMMAND ${PIP_CMG} -qP ${OPTIONS} -o ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_ccm -I${PIP_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/${SRC} OUTPUT_VARIABLE CMG_OUT)
message(STATUS "Creating code model done, to use it include \"${PROJECT_NAME}_ccm.h\"") message(STATUS "Creating code model done, to use it include \"${PROJECT_NAME}_ccm.h\"")
string(REPLACE "\n" ";" CMG_LIST "${CMG_OUT}") string(REPLACE "\n" ";" CMG_LIST "${CMG_OUT}")
string(REPLACE "\n" " " CMG_LIST_S "${CMG_OUT}") string(REPLACE "\n" " " CMG_LIST_S "${CMG_OUT}")
@@ -81,6 +86,5 @@ macro (pip_code_model SRC RESULT)
endif () endif ()
#message(STATUS ${CMG_OUT}) #message(STATUS ${CMG_OUT})
#message(STATUS ${CACHE_CMG_FILES}) #message(STATUS ${CACHE_CMG_FILES})
set(${RESULT} ${PROJECT_NAME}_ccm.cpp)
endmacro (pip_code_model) endmacro (pip_code_model)

4
src/io/pibinarylog.h
View File

@@ -76,7 +76,7 @@ public:
llong log_size; llong log_size;
PISystemTime start_time; PISystemTime start_time;
PISystemTime end_time; PISystemTime end_time;
PIMap<int,BinLogRecordInfo> records; PIMap<int, BinLogRecordInfo> records;
}; };
//! \brief Struct contains position, ID and timestamp of record in file //! \brief Struct contains position, ID and timestamp of record in file
@@ -99,7 +99,7 @@ public:
//! Returns current file prefix //! Returns current file prefix
PIString filePrefix() const {return property("filePrefix").toString();} PIString filePrefix() const {return property("filePrefix").toString();}
//! Current LogDir, returns directory where billogs wiil be saved //! Default ID, used in \a write function
int defaultID() const {return default_id;} int defaultID() const {return default_id;}
//! Returns current play speed //! Returns current play speed