WIP

README.md

@@ -2,6 +2,11 @@
 Data analysis library for PSI hybrid detectors
 
 
+## Status
+
+- [ ] Build with CMake on RH8
+- [ ] conda package
+
 
 ## Project structure 
 

conda-recipe/build.sh

@@ -1,3 +1,5 @@
+
+
 mkdir build
 mkdir install
 cd build
@@ -15,4 +17,4 @@ echo "Building using: ${NCORES} cores"
 cmake --build . -- -j${NCORES}
 cmake --build . --target install
 
-CTEST_OUTPUT_ON_FAILURE=1 ctest -j 1
+# CTEST_OUTPUT_ON_FAILURE=1 ctest -j 1

conda-recipe/copy_lib.sh

@@ -15,5 +15,5 @@ cp build/install/lib/* $PREFIX/lib/
 # cp build/install/bin/slsMultiReceiver $PREFIX/bin/.
 
 
-cp build/install/include/aare/* $PREFIX/include/sls
+cp build/install/include/aare/* $PREFIX/include/aare
 cp -rv build/install/share $PREFIX

conda-recipe/meta.yaml

@@ -35,8 +35,8 @@ requirements:
     # - expat
 
   host:
-    - libstdcxx-ng
-    - libgcc-ng
+    # - libstdcxx-ng
+    # - libgcc-ng
     # - xorg-libx11
     # - xorg-libice
     # - xorg-libxext
@@ -47,8 +47,8 @@ requirements:
     # - expat
 
   run:
-    - libstdcxx-ng
-    - libgcc-ng 
+    # - libstdcxx-ng
+    # - libgcc-ng 
 
 
 outputs:
@@ -59,13 +59,16 @@ outputs:
       build:
         - {{ compiler('c') }}
         - {{compiler('cxx')}}
-        - libstdcxx-ng
-        - libgcc-ng
+        - catch2
+        - zstd
+
+        # - libstdcxx-ng
+        # - libgcc-ng
 
 
       run: 
-        - libstdcxx-ng
-        - libgcc-ng
+        # - libstdcxx-ng
+        # - libgcc-ng
 
   # - name: aare
 

src/CMakeLists.txt

@@ -1,48 +0,0 @@
-
-
-set(SourceFiles
-    ${CMAKE_CURRENT_SOURCE_DIR}/defs.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/Dtype.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/Frame.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/File.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/NumpyFile.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/RawFile.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/SubFile.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/NumpyHelpers.cpp
-)
-
-
-add_library(aare_core STATIC ${SourceFiles})
-target_include_directories(aare_core PUBLIC 
-    "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
-    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
-
-
-    
-target_link_libraries(aare_core PUBLIC fmt::fmt PRIVATE aare_compiler_flags nlohmann_json::nlohmann_json)
-
-if (AARE_PYTHON_BINDINGS)
-    set_property(TARGET aare_core PROPERTY POSITION_INDEPENDENT_CODE ON)
-endif()
-
-if(AARE_TESTS)
-    set(TestSources
-            ${CMAKE_CURRENT_SOURCE_DIR}/defs.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/Dtype.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/Frame.test.cpp
-            # ${CMAKE_CURRENT_SOURCE_DIR}/test/ProducerConsumerQueue.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/NDArray.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/NDView.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/ClusterFinder.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/Pedestal.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/NumpyFile.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/NumpyHelpers.test.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/RawFile.test.cpp
-            # ${CMAKE_CURRENT_SOURCE_DIR}/test/CircularFifo.test.cpp
-            # ${CMAKE_CURRENT_SOURCE_DIR}/test/wrappers.test.cpp
-            # ${CMAKE_CURRENT_SOURCE_DIR}/test/Transforms.test.cpp
-
-        )
-    target_sources(tests PRIVATE ${TestSources} )
-endif()