X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMApplication.cpp;h=76b479866107151b74a1208ebcc27f61fe2ffb0c;hb=a26a54f4555934ed0f3720bea6bb95913d7f02d6;hp=f7925d3a3506fea81e117415b42a25331b675230;hpb=1841853d0641ad2c482ab8a2a6814fc05b2f6eba;p=crea.git diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp index f7925d3..76b4798 100644 --- a/lib/creaDevManagerLib/modelCDMApplication.cpp +++ b/lib/creaDevManagerLib/modelCDMApplication.cpp @@ -834,7 +834,7 @@ bool modelCDMApplication::SetCustomLibrary(const std::string& library_name, cons bool found = false; //find included libraries - std::cout << "searching..." << CMfile << std::endl; + //std::cout << "searching..." << CMfile << std::endl; boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)"); std::string::const_iterator start, end; start = CMfile.begin(); @@ -843,7 +843,7 @@ bool modelCDMApplication::SetCustomLibrary(const std::string& library_name, cons boost::match_flag_type flags = boost::match_default; if(boost::regex_search(start, end, what, expression, flags)) { - std::cout << what.str() << std::endl; + //std::cout << what.str() << std::endl; resCMfile += what.prefix().str(); expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES"); std::string::const_iterator start1, end1; @@ -916,14 +916,14 @@ bool modelCDMApplication::SetCustomLibrary(const std::string& library_name, cons found = false; - std::cout << "searching..." << CMfile << std::endl; + //std::cout << "searching..." << CMfile << std::endl; expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*([\\.\\/\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\")??(([\\s]|#[^\\n]*\\n)+([\\.\\/\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)"); start = CMfile.begin(); end = CMfile.end(); if(boost::regex_search(start, end, what, expression, flags)) { resCMfile += what.prefix().str(); - std::cout << what.str() << std::endl; + //std::cout << what.str() << std::endl; expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\("); std::string::const_iterator start1, end1; start1 = what[0].first; @@ -932,7 +932,7 @@ bool modelCDMApplication::SetCustomLibrary(const std::string& library_name, cons if(boost::regex_search(start1, end1, what1, expression, flags)) { resCMfile += what1.prefix().str() + what1.str(); - std::cout << what1.str() << std::endl; + //std::cout << what1.str() << std::endl; //search if dir is already included expression = boost::regex("^\\h*\\.\\.\\/\\.\\.\\/lib\\/"+correspondence[library_name]); std::string::const_iterator start2, end2;