Skip to content
Snippets Groups Projects
Commit f00719c6 authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny: Committed by Graeme Stewart
Browse files

removing dependency on libSM (x Window) which prevents compilation on Grid...

removing dependency on libSM (x Window) which prevents compilation on Grid worker nodes, for ATLAS@Home. Details: https://its.cern.ch/jira/browse/ATLASVPONE-318 (VP1HEPVis-00-06-17)

2016-05-25  Riccardo Maria BIANCHI <Riccardo.Maria.Bianchi@cern.ch>
    * removing dependency on libSM (x Window)
	  which prevents compilation on Grid worker nodes,
	  for ATLAS@Home.
	  Details: https://its.cern.ch/jira/browse/ATLASVPONE-318
    * new tag: VP1HEPVis-00-06-17

2016-02-17 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Updated the package to build correctly with CMake.
	* Removed the executable flag from the source files.
	* Deleted the empty directories.
	* Added some includes that are needed when building the library
	  in unoptimised mode with CMake.
	* Tagging as VP1HEPVis-00-06-16
parent a59a763b
No related merge requests found
Showing
with 40 additions and 1 deletion
################################################################################
# Package: VP1HEPVis
################################################################################
# Author: Joe Boudreau (Importer)
# Author: Riccardo Maria BIANCHI <rbianchi@cern.ch>
################################################################################
# Declare the package name:
atlas_subdir( VP1HEPVis )
# External dependencies:
find_package( Coin3D )
# Component(s) in the package:
atlas_add_library( VP1HEPVis src/*.cxx
PUBLIC_HEADERS VP1HEPVis
INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS}
LINK_LIBRARIES ${COIN3D_LIBRARIES} )
// Dear emacs, this is -*- c++ -*-
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
......@@ -30,6 +32,7 @@
* Used by the BooleanProcessor.
*/
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/SbVec3d.h>
namespace HEPVis {
......
......@@ -165,6 +165,7 @@
// - added a new GetVertexFast(), from Guy Barrand.
//
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/SbLinear.h>
......
// Dear emacs, this is -*- c++ -*-
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
......@@ -23,6 +25,7 @@
// Code taken from CoinGL/SbRotation but by using doubles instead of floats.
// It is used by SbPolyhedron::Transform.
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/SbVec4d.h>
class SbVec3d;
......
......@@ -5,6 +5,7 @@
#ifndef HEPVis_SoGL2PSAction_h
#define HEPVis_SoGL2PSAction_h
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/actions/SoGLRenderAction.h>
/**
......
......@@ -12,6 +12,7 @@
#ifndef HEPVis_SoCons_h
#define HEPVis_SoCons_h
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/fields/SoSFFloat.h>
#include <Inventor/fields/SoSFInt32.h>
#include <Inventor/fields/SoSFNode.h>
......
......@@ -18,6 +18,7 @@
#ifndef SOGENERICBOX_H
#define SOGENERICBOX_H
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/fields/SoSFNode.h>
#include <Inventor/fields/SoSFBool.h>
#include <Inventor/nodes/SoShape.h>
......
......@@ -13,6 +13,7 @@
#ifndef HEPVis_SoLAr_h
#define HEPVis_SoLAr_h
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/fields/SoSFFloat.h>
#include <Inventor/fields/SoMFFloat.h>
#include <Inventor/fields/SoSFInt32.h>
......
......@@ -15,6 +15,7 @@
#ifndef HEPVis_SoPcons_h
#define HEPVis_SoPcons_h
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/fields/SoSFFloat.h>
#include <Inventor/fields/SoMFFloat.h>
#include <Inventor/fields/SoSFInt32.h>
......
......@@ -17,6 +17,7 @@
#define HEPVis_SoPolyhedron_h
// Inheritance :
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/nodes/SoShape.h>
#include <Inventor/fields/SoSFBool.h>
......
......@@ -5,6 +5,7 @@
#ifndef SOTESSELLATED_H
#define SOTESSELLATED_H
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/fields/SoSFNode.h>
#include <Inventor/fields/SoSFBool.h>
#include <Inventor/nodes/SoShape.h>
......
......@@ -12,6 +12,7 @@
// //
////////////////////////////////////////////////////////////////
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/fields/SoSFFloat.h>
#include <Inventor/fields/SoSFBool.h>
#include <Inventor/nodes/SoSubNode.h>
......
......@@ -12,6 +12,7 @@
#ifndef HEPVis_SoTubs_h
#define HEPVis_SoTubs_h
#include <Inventor/C/errors/debugerror.h>
#include <Inventor/fields/SoSFFloat.h>
#include <Inventor/fields/SoSFNode.h>
#include <Inventor/fields/SoSFBool.h>
......
......@@ -18,7 +18,11 @@ macro VP1HEPVis_cppflags " -ansi -D_REENTRANT -I/usr/X11R6/include" \
target-darwin " -ansi -D_REENTRANT"
#Fixme: The linkopts (apart from the first) come from a run of coin-config --libs. We should call this instead of hardcoding!!
macro VP1HEPVis_linkopts " -lVP1HEPVis -lGL -lXext -lSM -lICE -lX11 -ldl -lpthread -lm" \
# ORIGINAL
#macro VP1HEPVis_linkopts " -lVP1HEPVis -lGL -lXext -lSM -lICE -lX11 -ldl -lpthread -lm" \
# target-darwin " -lVP1HEPVis -lpthread"
# TEST
macro VP1HEPVis_linkopts " -lVP1HEPVis -lGL -lXext -lICE -lX11 -ldl -lpthread -lm" \
target-darwin " -lVP1HEPVis -lpthread"
macro VP1HEPVis_shlibflags_toBeAppended " -lGL " \
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment