Commit 884d49d6 authored by Cocophotos's avatar Cocophotos

Merge branch 'develop'

* develop:
  Add comment # when reading a file of paths
  Enable make install for OGRE

Conflicts:
	CMakeLists.txt
parents d7b4e846 dfa94f57
......@@ -69,9 +69,9 @@ if(Boost_FOUND)
include_directories(${OGREComponents_INCLUDE_DIRS})
add_executable(${PROJECT_NAME} ${SRC_FILES})
target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} OGREComponents LinguisticGraph)
target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} OGREComponents LinguisticGraph)
install(TARGETS ${PROJECT_NAME} DESTINATION bin)
endif(Boost_FOUND)
......
......@@ -71,6 +71,10 @@ bool OGREStreamFile::find(std::string &path)
if(file.empty())
continue;
//Commented line, so skip
if(file.at(0) == '#')
continue;
fs::path p(file);
if( fs::exists(p) ){
if( !fs::is_regular_file(p) ){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment