From: Frederic Cervenansky Date: Tue, 23 Nov 2010 10:13:14 +0000 (+0000) Subject: don't add wxwidgets. X-Git-Tag: Creatools2-0-3.creaBruker1-0-1.17Feb2011~6 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=360e0f8bbbb16a0d7604e65e1059541a0e9d83c8;hp=4010128305f782ebfa194d548222bbaa1eec71d9;p=creaBruker.git don't add wxwidgets. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d127a67..2f42bb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,8 @@ SET(USE_CREA ON) OPTION(USE_GDCM "Use GDCM" ON) SET(USE_GDCM_VTK ON) OPTION(USE_GDCM2 "Use gdcm 2.0.14 at least" OFF) -SET(USE_WXWIDGETS OFF) +# No interface for the moment, don't allow to add useless libraries +SET(USE_WXWIDGETS OFF CACHE BOOL "Use wxWidgets" FORCE) SET(USE_KWWIDGETS OFF) SET(USE_VTK OFF) SET(USE_ITK OFF) diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 8ac2129..daf97a8 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -510,13 +510,13 @@ void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string &cu GDCM_NAME_SPACE::GDCM_FILESEPARATOR + "isa"; - std::string str_isa_func_name + std::string str_isa_func_name; canOpen = br_isa.LoadFile(str_isa); if (!canOpen) { sprintf(outputDirName, "%s%c%s", currentOutputDirName.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR, - GDCM_NAME_SPACE::Util::GetName(*it).c_str() ) + GDCM_NAME_SPACE::Util::GetName(*it).c_str() ); } else {