Commit 08c09632 authored by Augustin Degomme's avatar Augustin Degomme

- fixes a problem in src.pro file, where mpi was made mandatory (now uncomment...

- fixes a problem in src.pro file, where mpi was made mandatory (now uncomment mpi in CONFIG section of the file, to allow its use)
- add a forgotten option to allow the use of splitting without X running
- fixes a wrong indication in configure script, removing with_boost references


parent d60516ba
......@@ -173,7 +173,7 @@ usage()
echo " --tau_libdir=<path>"
echo " library path to the TAU libraries" echo ""
echo ""
echo " --use_boost"
echo " --use_serialization"
echo " use boost serialization in /usr/lib/"
echo ""
echo " --boost_libdir=<path>"
......
......@@ -379,7 +379,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${QTCOLORPICKERDIR}
)
#ADD_LIBRARY(vite2 SHARED ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS})
ADD_EXECUTABLE(vite ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS})
TARGET_LINK_LIBRARIES(vite
${QT_LIBRARIES}
......
......@@ -180,7 +180,7 @@ Core::Core(int &argc, char ** argv){
boost::mpi::environment env(argc, argv);
#endif
if (_state!= _STATE_EXPORT_FILE)
if (_state!= _STATE_SPLITTING && _state!= _STATE_EXPORT_FILE)
app = new QApplication(argc, argv);/* create the Qt application */
else
coreapp = new QCoreApplication(argc, argv);/* create the Qt application */
......
......@@ -46,7 +46,7 @@
#RESOURCES= vite.qrc
OBJECTS_DIR=../bin
DESTDIR=../bin
CONFIG+=uitools
CONFIG+=uitools # mpi
QT+=opengl
TEMPLATE = app
TARGET = vite
......@@ -60,12 +60,13 @@ QMAKE_CXXFLAGS += -O2 -Wall -g -DMT_PARSING
#TRANSLATIONS = ViTE_fr.ts
#LIBS += -lGLEW
LIBS += -lz -lrt -lXt -lboost_mpi -lmpi -lmpi_cxx
LIBS += -lz -lrt -lXt
unix{
#allow MPI only if mpi config is set in CONFIG, and platform is unix
unix:mpi{
QMAKESPEC = mpicc
QMAKE_CXX = mpic++
LIBS += -lboost_mpi -lmpi -lmpi_cxx
}
macx {
......
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