Commit f9f5aca0 authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Correction of the MathMore package detection

Ask for root6 for Cubix only
parent a54fa8c7
......@@ -94,7 +94,7 @@ ELSE(found_root_major_vers LESS 6)
ENDIF(found_root_major_vers LESS 6)
#
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized -Wno-unused-function -Wno-unused-result -Wno-unused-variable -Wno-overloaded-virtual -Wno-switch")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized -Wno-unused-function -Wno-unused-result -Wno-unused-variable -Wno-overloaded-virtual -Wno-switch -Wno-dev")
MESSAGE("[GW from ROOT] C Compiler ${CMAKE_C_COMPILER}")
MESSAGE("[GW from ROOT] C++ Compiler ${CMAKE_CXX_COMPILER}")
......
......@@ -60,7 +60,7 @@ endforeach()
if ( RDICTIONNARY EQUAL 1 )
ROOT_GENERATE_DICTIONARY(G__${GWLIBNAME} ${headers} MODULE ${GWLIBNAME} LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/LinkDef.h OPTIONS "")
find_library(ISMATHMORE MathMore)
if ( ISMATHMORE EQUAL ISMATHMORE_NOTFOUND)
if(NOT ISMATHMORE)
set( EXTRA_EXTERNAL_LIBRARIES Core Graf MathCore XMLParser Hist Physics Gui Spectrum Tree RIO Gpad )
MESSAGE("[GW-GEM] Compiled without MathMore")
else()
......@@ -71,7 +71,7 @@ if ( RDICTIONNARY EQUAL 1 )
else ()
ROOT_GENERATE_DICTIONARY(G__${GWLIBNAME} ${headers} LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/LinkDef.h)
find_library(ISMATHMORE MathMore)
if ( ISMATHMORE EQUAL ISMATHMORE_NOTFOUND)
if(NOT ISMATHMORE)
set( EXTRA_EXTERNAL_LIBRARIES Core Graf MathCore XMLParser Hist Physics Gui Spectrum Tree RIO Gpad )
MESSAGE("[GW-GEM] Compiled without MathMore")
else()
......
......@@ -5,7 +5,13 @@
#----------------------------------------------------------------------------
# Add modules
#
add_subdirectory (cubix)
if (found_root_major_vers LESS 6)
MESSAGE( "ERROR: Invalid ROOT version \"${ROOTERSION}\", at least major version 6 is required for Cubix, e.g. \"6.00/00\"")
MESSAGE( "[GW] !!! Cubix ignored")
else()
add_subdirectory (cubix)
endif (found_root_major_vers LESS 6)
......@@ -41,20 +41,9 @@ endif()
if(ROOT_FOUND)
include_directories(${ROOT_INCLUDE_DIRS})
else()
message(ERROR "ROOT not found")
message(ERROR ": ROOT not found !!!")
endif()
#
# Redirection to the right macro depending on the ROOT version
#
STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+\\/[0-9][0-9]+.*" "\\1" found_root_major_vers "${ROOTVERSION}")
STRING(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+\\/[0-9][0-9]+.*" "\\1" found_root_minor_vers "${ROOTVERSION}")
STRING(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+\\/([0-9][0-9]+).*" "\\1" found_root_patch_vers "${ROOTVERSION}")
IF (found_root_major_vers LESS 6)
MESSAGE( FATAL_ERROR "Invalid ROOT version \"${ROOTERSION}\", at least major version 6 is required, e.g. \"6.00/00\"")
ENDIF (found_root_major_vers LESS 6)
######################
### Link libraries ###
######################
......
......@@ -57,7 +57,7 @@ CXLevelSchemePlayer::CXLevelSchemePlayer(const char* name, const char *title) :
TSystemDirectory dir(fENSDFDataDir,fENSDFDataDir);
if(dir.GetListOfFiles() == nullptr || (dir.GetListOfFiles() != nullptr && dir.GetListOfFiles()->GetEntries()<=2) ){
TString temp = Form("%s/DataBase/LevelScheme/README",getenv("GWSYS"));
fBashColor->WarningMessage(Form("No ENSDF data found in %s, follow the procedure explained in %s to download the data from the ENSDF web site",fENSDFDataDir.Data(),temp.Data()));
fBashColor->InfoMessage(Form("No ENSDF data found in %s, follow the procedure explained in %s to download the data from the ENSDF web site",fENSDFDataDir.Data(),temp.Data()));
}
if(gNDManager == nullptr)
......
......@@ -909,6 +909,9 @@ void CXMainWindow::AddToStoredSpectra(TObject *c)
TObject *o = c;
if(fHist2DPlayer){
if(IsHist2DPlayerEnabled==false)
ToggleTab(IsHist2DPlayerEnabled,M_Hist2DPlayer,fHist2DPlayerTab,fHist2DPlayer->GetName());
fHist2DPlayer->AddToStoredList(o->Clone());
}
}
......
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