Changeset 886


Ignore:
Timestamp:
Nov 19, 2008, 2:41:24 PM (16 years ago)
Author:
garnier
Message:

change and better Leopard check on Mac OSX

Location:
trunk/config
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/History

    r868 r886  
    1 $Id: History,v 1.330 2008/10/15 10:10:51 lgarnier Exp $
     1$Id: History,v 1.334 2008/11/17 14:49:00 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     ----------------------------------------------------------
    1818
     1917th November 2008  Laurent Garnier
     20- Darwin.gmk
     21 - Try to better find if GL conflicts on Darwin : Should be Ok now. I check the version of the system
     22
     2314th November 2008  Gabriele Cosmo (config-V09-01-10)
     24- Added "electromagnetic/adjoint" sub-module in binmake.gmk.
     25
     266th November 2008  Gabriele Cosmo (config-V09-01-09)
     27- Added "particles/adjoint" sub-module in binmake.gmk.
     28
     2923rd October 2008  Gabriele Cosmo (config-V09-01-08)
     30- Added "persistency/ascii" sub-module in binmake.gmk.
     31
    193215th October 2008  Laurent Garnier
    2033- Darwin.gmk :
    2134  - Try to improve Qt config for Darwin :
    22    - No more QTHOME or QTLIBS flags to be set
    23    - Qt3 multithread or not auto select libraries
    24    - Suppress some unuseful link and compil options
     35  - No more QTHOME or QTLIBS flags to be set
     36  - Qt3 multithread or not auto select libraries
     37  - Suppress some unuseful link and compil options
    2538
    263910th October 2008  Laurent Garnier
    … …  
    3245- interactivity.gmk : changing flags for OpenGL and QT
    3346- Darwin-g++.gmk,Linux-g++.gmk,WIN32-VC.gmk : Improvments in those files, and for GLQT libs
    34 
    3547
    364811th July 2008  Gabriele Cosmo (config-V09-01-07)

  • trunk/config/architecture.gmk

    r850 r886  
    1 # $Id: architecture.gmk,v 1.115 2008/07/11 15:40:14 gcosmo Exp $
     1# $Id: architecture.gmk,v 1.116 2008/11/13 16:15:14 gcosmo Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make
    … …  
    1616#          Linux-g++   Linux (Red Hat Enterprise/SCL4), gcc-3.4.6 (default)
    1717#
    18 #          SUN-CC      SunOS 5.8, CC 5.5
    19 #
    20 #          WIN32-VC    Windows/XP and Microsoft Visual C++ 8.0
     18#          Darwin-g++  MacOSX 10.5, gcc-4.0.1
     19#
     20#          WIN32-VC    Windows/XP and Microsoft Visual C++ 9.0
    2121#                      Adding CYGWIN32 tools
    2222# -------------------------------------------------------------------------

  • trunk/config/binmake.gmk

    r787 r886  
    1 # $Id: binmake.gmk,v 1.135 2007/11/22 14:08:10 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.138 2008/11/14 19:58:19 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    5454              -I$(G4BASE)/parameterisations/gflash/include \
    5555              -I$(G4BASE)/particles/management/include \
     56              -I$(G4BASE)/particles/adjoint/include \
    5657              -I$(G4BASE)/particles/bosons/include \
    5758              -I$(G4BASE)/particles/leptons/include \
    … …  
    7071              -I$(G4BASE)/processes/transportation/include \
    7172              -I$(G4BASE)/processes/parameterisation/include \
     73              -I$(G4BASE)/processes/electromagnetic/adjoint/include \
    7274              -I$(G4BASE)/processes/electromagnetic/standard/include \
    7375              -I$(G4BASE)/processes/electromagnetic/muons/include \
    … …  
    144146              -I$(G4BASE)/digits_hits/scorer/include \
    145147              -I$(G4BASE)/digits_hits/utils/include \
     148              -I$(G4BASE)/persistency/ascii/include \
    146149              -I$(G4BASE)/persistency/gdml/include \
    147150              -I$(G4BASE)/persistency/mctruth/include \

  • trunk/config/scripts/env.csh.SH

    r689 r886  
    384384endif
    385385
    386 #+
    387 if ( X$g4_qthome != X ) then
    388 setenv QTHOME "$g4_qthome"
    389 echo "On this machine the QTHOME=\$QTHOME"
    390 endif
    391 
    392 
    393386
    394387#+
    … …  
    427420echo "On this machine the XAWLIBS=\$XAWLIBS"
    428421endif
     422
     423
     424#
     425# Qt Flags and Libs, messy, but needed for backward compatibility
     426#+
     427if ( "X$g4ui_build_qt_session" == "Xy" || "X$g4ui_use_qt" == "Xy" )  then
     428setenv QTFLAGS "$g4_qt_cxxflags"
     429setenv QTLIBS "$g4_qt_libs"
     430setenv QTMOC "$g4_qt_moc"
     431echo "On this machine the QTFLAGS=\$QTFLAGS"
     432echo "On this machine the QTLIBS=\$QTLIBS"
     433echo "On this machine the QTMOC=\$QTMOC"
     434endif
     435
     436if ( "X$g4vis_build_openglqt_driver" == "Xy" || "X$g4vis_build_openglqt_driver" == "Xy" )  then
     437if ( "X\$QTFLAGS" == "X" )  then
     438setenv QTFLAGS "$g4_qt_cxxflags $g4_qt_gl_cxxflags"
     439else
     440setenv QTFLAGS "\$QTFLAGS $g4_qt_gl_cxxflags"
     441endif
     442if ( "X\$QTMOC" == "X" )  then
     443setenv QTMOC "$g4_qt_moc"
     444endif
     445setenv GLQTLIBS "$g4_qt_libs $g4_qt_gl_libs"
     446echo "On this machine the QTFLAGS=\$QTFLAGS"
     447echo "On this machine the GLQTLIBS=\$GLQTLIBS"
     448echo "On this machine the QTMOC=\$QTMOC"
     449endif
     450
     451
    429452
    430453

  • trunk/config/scripts/env.sh.SH

    r689 r886  
    524524fi
    525525
    526 #+
    527 if [ X$g4_qthome != X ] ; then
    528 QTHOME=$g4_qthome
    529 export QTHOME
    530 if [ X\$g4non_display = X ] ; then
    531 echo "On this machine the QTHOME=\$QTHOME"
    532 fi
    533 fi
    534526
    535527
    … …  
    587579fi
    588580fi
     581
     582
     583#
     584# Qt Flags and Libs, messy, but needed for backward compatibility
     585#+
     586if [ "X$g4ui_build_qt_session" = "Xy" -o "X$g4ui_use_qt" = "Xy" ] ; then
     587QTFLAGS="$g4_qt_cxxflags"
     588QTLIBS="$g4_qt_libs"
     589QTMOC="$g4_qt_moc"
     590export QTFLAGS
     591export QTLIBS
     592export QTMOC
     593echo "On this machine the QTFLAGS=\$QTFLAGS"
     594echo "On this machine the QTLIBS=\$QTLIBS"
     595echo "On this machine the QTMOC=\$QTMOC"
     596fi
     597
     598if [ "X$g4vis_build_openglqt_driver" = "Xy" -o "X$g4vis_build_openglqt_driver" = "Xy" ] ; then
     599if [ "X\$QTFLAGS" = "X" ] ; then
     600QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
     601else
     602QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
     603fi
     604if [ "X\$QTMOC" = "X" ] ; then
     605QTMOC="$g4_qt_moc"
     606fi
     607GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
     608export QTFLAGS
     609export QTMOC
     610export GLQTLIBS
     611echo "On this machine the QTFLAGS=\$QTFLAGS"
     612echo "On this machine the GLQTLIBS=\$GLQTLIBS"
     613echo "On this machine the QTMOC=\$QTMOC"
     614fi
     615
    589616
    590617

  • trunk/config/scripts/install.sh.SH

    r689 r886  
    280280export G4UI_BUILD_QT_SESSION
    281281echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
    282 fi 
     282fi
    283283
    284284#+
    … …  
    354354export G4VIS_BUILD_OPENGLQT_DRIVER
    355355echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
    356 fi 
     356fi
    357357
    358358
    … …  
    442442fi
    443443
    444 #+
    445 if [ X$g4_qthome != X ] ; then
    446 QTHOME=$g4_qthome
    447 export QTHOME
    448 echo "On this machine the QTHOME=\$QTHOME"
    449 fi
    450 
    451444
    452445#+
    … …  
    503496fi
    504497fi
     498
     499
     500
     501# Qt Flags and Libs, messy, but needed for backward compatibility
     502#+
     503if [ "X$g4ui_build_qt_session" = "Xy" -o "X$g4ui_use_qt" = "Xy" ] ; then
     504QTFLAGS="$g4_qt_cxxflags"
     505QTLIBS="$g4_qt_libs"
     506QTMOC="$g4_qt_moc"
     507export QTFLAGS
     508export QTLIBS
     509export QTMOC
     510if [ X\$g4non_display = X ] ; then
     511echo "On this machine the QTFLAGS=\$QTFLAGS"
     512echo "On this machine the QTLIBS=\$QTLIBS"
     513echo "On this machine the QTMOC=\$QTMOC"
     514fi
     515fi
     516
     517if [ "X$g4vis_build_openglqt_driver" = "Xy" -o "X$g4vis_build_openglqt_driver" = "Xy" ] ; then
     518if [ "X\$QTFLAGS" = "X" ] ; then
     519QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
     520else
     521QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
     522fi
     523if [ "X\$QTMOC" = "X" ] ; then
     524QTMOC="$g4_qt_moc"
     525fi
     526GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
     527export QTFLAGS
     528export QTMOC
     529export GLQTLIBS
     530if [ X\$g4non_display = X ] ; then
     531echo "On this machine the QTFLAGS=\$QTFLAGS"
     532echo "On this machine the GLQTLIBS=\$GLQTLIBS"
     533echo "On this machine the QTMOC=\$QTMOC"
     534fi
     535fi
    505536
    506537

  • trunk/config/sys/Darwin-g++.gmk

    r875 r886  
    6464  endif
    6565  ifndef OGLLIBS
    66     OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
    67     ifeq ($(G4SYSTEM),Darwin-g++)
    68           # the following lines are for building on MacOSX 10.5 "Leopard"
     66    ifeq ($(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/'),9)
     67      # the following lines are for building on MacOSX 10.5 "Leopard"
    6968      OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo " -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
    70       endif
     69    else
     70      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
     71    endif
    7172  endif
    7273  ifndef QTHOME
    … …  
    9394    endif
    9495  endif
    95 
    9696  ifndef QTLIBPATH
    9797    ifeq ($(QT_VERSION),3)

  • trunk/config/sys/Linux-g++.gmk

    r875 r886  
    7272  ifndef QTFLAGS
    7373    ifeq ($(QT_VERSION),4)
    74       QTFLAGS   := -I $(QTHOME)/include/qt$(QT_VERSION)/QtCore
     74      QTFLAGS   += -I$(QTHOME)/include/qt$(QT_VERSION)
     75      QTFLAGS   += -I $(QTHOME)/include/qt$(QT_VERSION)/QtCore
    7576      QTFLAGS   += -I $(QTHOME)/include/qt$(QT_VERSION)/QtGui
    7677      QTFLAGS   += -I $(QTHOME)/include/qt$(QT_VERSION)/QtOpenGL
Note: See TracChangeset for help on using the changeset viewer.