refactor

dftlibs · Oct 9, 2017 · c1fa1a6 · c1fa1a6
1 parent e0ea1a1
commit c1fa1a6
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,14 +30,11 @@ include(autocmake_custom_color_messages)
 include(autocmake_python_interpreter)
 include(autocmake_ccache)
 include(numgrid)
-include(api)
 include(GNUdirs)
-include(include_paths)
 include(external)
 include(rpath)
 include(version)
 include(static_library)
-include(export)
 include(autocmake_definitions)
 include(autocmake_code_coverage)
 include(autocmake_safeguards)

diff --git a/cmake/autocmake.yml b/cmake/autocmake.yml
@@ -24,14 +24,11 @@ modules:
     - '%(url_root)modules/python_interpreter.cmake'
     - '%(url_root)modules/ccache.cmake'
     - 'custom/numgrid.cmake'
-    - 'custom/api.cmake'
     - 'custom/GNUdirs.cmake'
-    - 'custom/include_paths.cmake'
     - 'custom/external.cmake'
     - 'custom/rpath.cmake'
     - 'custom/version.cmake'
     - 'custom/static_library.cmake'
-    - 'custom/export.cmake'
     - '%(url_root)modules/definitions.cmake'
     - '%(url_root)modules/code_coverage.cmake'
     - '%(url_root)modules/safeguards.cmake'

diff --git a/cmake/custom/api.cmake b/cmake/custom/api.cmake
diff --git a/cmake/custom/export.cmake b/cmake/custom/export.cmake
diff --git a/cmake/custom/include_paths.cmake b/cmake/custom/include_paths.cmake
diff --git a/numgrid/CMakeLists.txt b/numgrid/CMakeLists.txt
@@ -6,6 +6,7 @@ add_library(_numgrid OBJECT
   bragg.cpp
   )
 target_include_directories(_numgrid SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/external/upstream)
+target_include_directories(_numgrid SYSTEM PRIVATE ${PROJECT_BINARY_DIR}/include)
 add_dependencies(_numgrid version)
 set_target_properties(_numgrid PROPERTIES POSITION_INDEPENDENT_CODE 1)
 list(APPEND _objects
@@ -89,3 +90,13 @@ if(NOT SHARED_LIBRARY_ONLY)
     NAMESPACE "${PROJECT_NAME}::"
     DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 endif()
+
+install(FILES ${PROJECT_SOURCE_DIR}/numgrid/numgrid.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+
+message(STATUS "numgrid Fortran bindings ${BoldBlue}${ENABLE_FC_SUPPORT}${ColourReset}")
+if(ENABLE_FC_SUPPORT)
+  add_library(numgrid_fortran OBJECT ${PROJECT_SOURCE_DIR}/numgrid/numgrid.f90)
+  set_target_properties(numgrid_fortran PROPERTIES INCLUDE_DIRECTORIES ""
+    POSITION_INDEPENDENT_CODE 1
+    )
+endif()
diff --git a/include/error_handling.h → numgrid/error_handling.h b/include/error_handling.h → numgrid/error_handling.h
diff --git a/api/numgrid.f90 → numgrid/numgrid.f90 b/api/numgrid.f90 → numgrid/numgrid.f90
diff --git a/include/parameters.h → numgrid/parameters.h b/include/parameters.h → numgrid/parameters.h
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -14,6 +14,8 @@ add_executable(
   test.cpp
   )
 
+target_include_directories(cpp_test SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/numgrid ${PROJECT_BINARY_DIR}/include)
+
 add_dependencies(cpp_test gtest)
 
 target_link_libraries(