Commit 60cd3d35 authored by Deepak Rangarajan's avatar Deepak Rangarajan
Browse files

Merge branch 'mwm/reorg' into 'master' 

Reorganize functions

See merge request exa/mfix-parser!30
parents a23c1b2c bd5f565d

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ test:cmake: 
    - cmake -S. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Debug

    - cmake --build build --target unit_tests_csg

    - cd build

    - ctest

    - ctest --verbose

  tags:

    - mfix-exa

CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ if(CCACHE_FOUND) 
  set( CMAKE_CXX_COMPILER_LAUNCHER ccache )

endif()



option(ENABLE_CSG "Build with CSG support" OFF)



# Download automatically, you can also just copy the conan.cmake file

if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")

  message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
@@ -37,7 +35,9 @@ include(Catch) 


add_subdirectory(src/csg)



target_include_directories(csg PRIVATE

  ${CONAN_INCLUDE_DIRS_PEGTL})

target_include_directories(csg

  PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include

  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CONAN_INCLUDE_DIRS_PEGTL}

  )



target_compile_features(csg PRIVATE cxx_std_17)

src/csg/csg.hpp→include/csg.hpp

+0 −0

File moved.

View file

src/inputs/solver.hpp→include/solver.hpp

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <variant>

#include <vector>



#include <inputs.hpp>

#include <solver_inputs.hpp>



namespace solver {

meson.build

+1 −13
Original line number Diff line number Diff line
@@ -8,19 +8,7 @@ pegtl = dependency('pegtl', method: 'pkg-config') 
catch2 = dependency('catch2', method: 'pkg-config')

cgal = dependency('cgal', method: 'pkg-config')



parser_inc = include_directories(

  'src/csg',

  'src/csg/impl',

  'src/inputs')

parser_inc = include_directories('include', 'src')



subdir('src/csg')

subdir('src/inputs')
 


executable(

  'mfix-parser',

  'src/main.cpp',

  include_directories: parser_inc,

  link_with: [

    lib_csg_parser,

    lib_inputs_parser,

  ])