Changeset 503a972 in sasview


Ignore:
Timestamp:
Jan 6, 2012 3:46:21 PM (12 years ago)
Author:
Mathieu Doucet <doucetm@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
0c74c85
Parents:
11005e5
Message:

more include dir in a more sensible place

Files:
50 added
4 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/CMakeLists.txt

    r14de443 r503a972  
    7272    src/c_models/parameters.hh 
    7373    src/c_models/dispersion_visitor.hh 
    74     src/include/sphere.h 
    75     src/include/hollow_cylinder.h 
    76     src/include/binaryHS.h 
    77     src/include/multishell.h 
    78     src/include/sc.h 
    79     src/include/StickyHS.h 
    80     src/include/vesicle.h 
    81     src/include/flexible_cylinder.h 
    82     src/include/csparallelepiped.h 
    83     src/include/flexcyl_ellipX.h 
    84     src/include/gaussian.h 
    85     src/include/lamellarPC.h 
    86     src/include/ellipsoid.h 
    87     src/include/stacked_disks.h 
    88     src/include/SquareWell.h 
    89     src/include/lamellarFF_HG.h 
    90     src/include/lamellarPS_HG.h 
    91     src/include/lorentzian.h 
    92     src/include/fractal.h 
    93     src/include/lamellarPS.h 
    94     src/include/cylinder.h 
    95     src/include/elliptical_cylinder.h 
    96     src/include/schulz.h 
    97     src/include/Hardsphere.h 
    98     src/include/refl_adv.h 
    99     src/include/barbell.h 
    100     src/include/spheresld.h 
    101     src/include/parallelepiped.h 
    102     src/include/pearlnecklace.h 
    103     src/include/sld_cal.h 
    104     src/include/logNormal.h 
    105     src/include/spheroid.h 
    106     src/include/HayterMSA.h 
    107     src/include/polygausscoil.h 
    108     src/include/corefourshell.h 
    109     src/include/fcc.h 
    110     src/include/triaxial_ellipsoid.h 
    111     src/include/capcyl.h 
    112     src/include/DiamCyl.h 
    113     src/include/onion.h 
    114     src/include/bcc.h 
    115     src/include/core_shell_cylinder.h 
    116     src/include/lamellar.h 
    117     src/include/rpa.h 
    118     src/include/core_shell.h 
    119     src/include/fuzzysphere.h 
    120     src/include/refl.h 
    121     src/include/DiamEllip.h 
     74    include/sphere.h 
     75    include/hollow_cylinder.h 
     76    include/binaryHS.h 
     77    include/multishell.h 
     78    include/sc.h 
     79    include/StickyHS.h 
     80    include/vesicle.h 
     81    include/flexible_cylinder.h 
     82    include/csparallelepiped.h 
     83    include/flexcyl_ellipX.h 
     84    include/gaussian.h 
     85    include/lamellarPC.h 
     86    include/ellipsoid.h 
     87    include/stacked_disks.h 
     88    include/SquareWell.h 
     89    include/lamellarFF_HG.h 
     90    include/lamellarPS_HG.h 
     91    include/lorentzian.h 
     92    include/fractal.h 
     93    include/lamellarPS.h 
     94    include/cylinder.h 
     95    include/elliptical_cylinder.h 
     96    include/schulz.h 
     97    include/Hardsphere.h 
     98    include/refl_adv.h 
     99    include/barbell.h 
     100    include/spheresld.h 
     101    include/parallelepiped.h 
     102    include/pearlnecklace.h 
     103    include/sld_cal.h 
     104    include/logNormal.h 
     105    include/spheroid.h 
     106    include/HayterMSA.h 
     107    include/polygausscoil.h 
     108    include/corefourshell.h 
     109    include/fcc.h 
     110    include/triaxial_ellipsoid.h 
     111    include/capcyl.h 
     112    include/DiamCyl.h 
     113    include/onion.h 
     114    include/bcc.h 
     115    include/core_shell_cylinder.h 
     116    include/lamellar.h 
     117    include/rpa.h 
     118    include/core_shell.h 
     119    include/fuzzysphere.h 
     120    include/refl.h 
     121    include/DiamEllip.h 
    122122    src/libigor/GaussWeights.h 
    123123    src/libigor/libSANSAnalysis.h 
    … …  
    131131) 
    132132     
    133 include_directories (src/libigor src/include src/c_models) 
     133include_directories (src/libigor include src/c_models) 
    134134 
    135135# Add the target for this directory 

  • sansmodels/generate_cmake.py

    r26e0249 r503a972  
    4343 
    4444include_dirs = ["src/c_models", 
    45                 "src/include", 
     45                "include", 
    4646                "src/libigor"] 
    4747 
    … …  
    5555) 
    5656     
    57 include_directories (src/libigor src/include src/c_models) 
     57include_directories (src/libigor include src/c_models) 
    5858 
    5959# Add the target for this directory 

  • sansmodels/setup.py

    r26e0249 r503a972  
    4848 
    4949# Build the module name 
    50 includedir  = os.path.join("src", "include") 
     50includedir  = "include" 
    5151igordir = os.path.join("src", "libigor") 
    5252c_model_dir = os.path.join("src", "c_models") 

  • setup.py

    r101065a r503a972  
    212212 
    213213# Sans models 
    214 includedir  = os.path.join("sansmodels", "src", "include") 
     214includedir  = os.path.join("sansmodels", "include") 
    215215igordir = os.path.join("sansmodels", "src", "libigor") 
    216216c_model_dir = os.path.join("sansmodels", "src", "c_models") 
Note: See TracChangeset for help on using the changeset viewer.