Merge pull request #902 from tpersson/dist2020june

Distribution + energy update (first step) + RF-fringe

.travis.yml

@@ -15,7 +15,10 @@ install:
   - make numdiff-linux64-gnu
 
   - pip install cython
-  - git clone https://github.com/hibtc/cpymad.git
+  - git clone https://github.com/tpersson/cpymad.git
+  - cd cpymad
+  - git checkout addingDistribution
+  - cd ..
   - ./buildcpymad.sh
   - cd cpymad && python setup.py build_ext --no-X11 --blas --lapack --madxdir=$MADXDIR
   - pip install -e .

CMakeLists.txt

@@ -30,6 +30,7 @@ include(setupCompilerSpecifics)
 include(setupArchSpecifics)
 
 add_subdirectory(libs/ptc)
+add_subdirectory(libs/DISTlib)
 add_subdirectory(src)
 add_subdirectory(tools)
 add_subdirectory(syntax)

Makefile_c

@@ -16,16 +16,19 @@
 # | $Id$
 # |
 
-vpath %.h src
-vpath %.c src
+vpath %.h src libs/DISTlib/source
+vpath %.c src libs/DISTlib/source
 vpath %.d $(OBJDIR)
 
-CC_HDR := $(notdir $(wildcard src/mad_*.h))
-CC_SRC := $(notdir $(wildcard src/mad_*.c))
+CC_HDR :=$(notdir $(wildcard libs/DISTlib/source/*.h src/mad_*.h)) 
+CC_SRC :=$(notdir $(wildcard libs/DISTlib/source/*.c src/mad_*.c)) 
+
 
 CC_HDR += madx.h SDDS.h
 CC_SRC +=
 
+
+
 # files specific dependency flags
 $(OBJDIR)/mad_gxx11c.d: CPPFLAGS += $(call incdir,/usr/X11/include /opt/X11/include)
 

libs/DISTlib/CMakeLists.txt

@@ -0,0 +1,2 @@
+include(buildtypeCoverage)
+add_subdirectory(source)

libs/DISTlib/source/CMakeLists.txt

@@ -0,0 +1,6 @@
+file(GLOB src_files *.c *.h)
+
+add_library(DISTlib STATIC ${src_files})
+if (NOT BUILD_SHARED_LIBS)
+    install(TARGETS DISTlib ARCHIVE DESTINATION lib)
+endif ()