Merge branch 'master' of https://github.com/ssg-aero/yams

ssg-aero · Jul 4, 2022 · db2a108 · db2a108
2 parents 9475905 + e0874f8
commit db2a108
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,7 @@ endfunction()
 file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} lib_dir)
 file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR} bin_dir)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
 include_directories(${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/gbs)
 link_directories(${lib_dir})
 link_directories(${bin_dir})

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -0,0 +1,18 @@
+name: yams
+channels:
+  - conda-forge
+  - ssg-aero
+dependencies:
+  - cxx-compiler
+  - cmake
+  - ninja
+  - rapidjson
+  - xtensor
+  - xsimd
+  - eigen
+  - vtk
+  - gbs
+  - python=3.9
+  - pybind11
+  - pytest
+  - sel(win): vs2019_win-64