Commit 25755aad authored by Mark Meredith's avatar Mark Meredith
Browse files

Merge branch 'mwm/meson' into 'master' 

Use Meson for building

See merge request exa/mfix-parser!4
parents 5ed9c5c4 077654de

.gitlab-ci.yml

+6 −8
Original line number Diff line number Diff line 
image: mwm126/mfix-exa:cuda

image: python:3.7.5-buster



variables:

  GIT_STRATEGY: fetch
@@ -8,12 +8,10 @@ variables: 


test:all:

  script:

    - cmake -S .

            -B build

            -G Ninja

    - cmake --build build --target unit_tests

    - ./build/src/tests/unit_tests

    - cmake --build build --target mfix-parser

    - find -name inputs |grep -v tutorials/wdf/mueller | xargs -l ./build/mfix-parser # FIXME: correct syntax error (= =) in file

    - python -m pip install meson ninja

    - meson build

    - meson test -C build

    - ninja -C build src/mfix-parser

    - find -name inputs |grep -v tutorials/wdf/mueller | xargs -l ./build/src/mfix-parser # FIXME: correct syntax error (= =) in file

  tags:

    - mfix-exa

CMakeLists.txt

+15 −0
Original line number Diff line number Diff line
@@ -18,6 +18,21 @@ if(CCACHE_FOUND) 
endif()



add_subdirectory(src)

add_subdirectory(tests)



find_program(CLANG_FMT NAMES clang-format-9 clang-format-8 clang-format-7 clang-format)



if(CLANG_FMT)

  get_target_property(_psrcs unit_tests SOURCES)

  add_custom_target(fmt_test

    COMMAND ${CLANG_FMT} -i ${_psrcs}

    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests

    )

  file(GLOB _includes ${PROJECT_SOURCE_DIR}/src/*.hpp)



  add_custom_target(fmt)

  add_dependencies(fmt fmt_test)

endif()



set(EXENAME "mfix-parser")

add_executable(${EXENAME} src/main.cpp)

meson.build

0 → 100644
+10 −0
Original line number Diff line number Diff line 
project('mfix-parser', 'cpp',

        version : '0.1',

        default_options : ['warning_level=3', 'cpp_std=c++17'])



tao_inc = include_directories('subprojects/PEGTL/include')

catch2_inc = include_directories('subprojects/Catch2/single_include')

parser_inc = include_directories('src')



subdir('src')

subdir('tests')

src/CMakeLists.txt

+0 −16
Original line number Diff line number Diff line
@@ -12,19 +12,3 @@ target_include_directories(parser PRIVATE 
  ${CMAKE_SOURCE_DIR}/subprojects/PEGTL/include)



target_link_libraries(parser PRIVATE stdc++fs)
 


add_subdirectory(tests)



find_program(CLANG_FMT NAMES clang-format-9 clang-format-8 clang-format-7 clang-format)



if(CLANG_FMT)

  get_target_property(_psrcs unit_tests SOURCES)

  add_custom_target(fmt_test

    COMMAND ${CLANG_FMT} -i ${_psrcs}

    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests

    )

  file(GLOB _includes ${PROJECT_SOURCE_DIR}/src/*.hpp)



  add_custom_target(fmt)

  add_dependencies(fmt fmt_test)

endif()

src/meson.build

0 → 100644
+10 −0
Original line number Diff line number Diff line 
lib_parser = static_library('mfix-parser',

                            'inputs_file.cpp',

                            'parser.cpp',

                            'solver.cpp',

                            include_directories: tao_inc,

                            install : true)



executable('mfix-parser',

           'main.cpp',

           link_with: lib_parser)