Add C wrapper in cali-manager.h (LLNL#269)

whitworthtrina00 · May 1, 2020 · 8602d2e · 8602d2e
1 parent 9ac3b6e
commit 8602d2e
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/examples/apps/CMakeLists.txt b/examples/apps/CMakeLists.txt
@@ -1,16 +1,12 @@
 project(caliper-examples)
 
-if (${CMAKE_CXX_COMPILER_ID} MATCHES Intel)
-  # CMake does not have proper compiler feature support for Intel compilers :-/
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-else()
-  set(CMAKE_C_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON) 
-
-  set(CMAKE_CXX_STANDARD 11)
-  set(CMAKE_C_STANDARD   99)
-endif()
+include_directories("../../src/interface/c_fortran")
+
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD   99)
 
 set(CALIPER_CXX_EXAMPLE_APPS
   cxx-example

diff --git a/include/caliper/cali-manager.h b/include/caliper/cali-manager.h
@@ -3,9 +3,11 @@
 
 #pragma once
 
+#include "wrapConfigManager.h"
+
 #ifdef __cplusplus
-#include "caliper/ConfigManager.h"
-#include "caliper/ChannelController.h"
+#include "ConfigManager.h"
+#include "ChannelController.h"
 
 extern "C" {
 #endif

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ set(CMAKE_C_STANDARD   99)
 
 include_directories(${PROJECT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/interface/c_fortran)
 
 add_subdirectory(common)
 add_subdirectory(interface/c_fortran)

diff --git a/src/caliper/ConfigManager.cpp b/src/caliper/ConfigManager.cpp
@@ -1140,6 +1140,7 @@ std::vector<std::string>
 ConfigManager::get_config_docstrings()
 {
     ConfigManagerImpl mgr;
+    mgr.import_builtin_config_specs();
     return mgr.get_docstrings();
 }
 

diff --git a/src/interface/c_fortran/wrapCaliper.cpp b/src/interface/c_fortran/wrapCaliper.cpp
@@ -6,7 +6,7 @@
 #include "typesCaliper.h"
 
 #include "BufferedRegionProfile.h"
-#include "caliper/cali-manager.h"
+#include "caliper/ConfigManager.h"
 
 // splicer begin CXX_definitions
 // splicer end CXX_definitions

diff --git a/src/interface/c_fortran/wrapConfigManager.cpp b/src/interface/c_fortran/wrapConfigManager.cpp
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <cstring>
 #include <string>
-#include "caliper/cali-manager.h"
+#include "caliper/ConfigManager.h"
 
 // splicer begin class.ConfigManager.CXX_definitions
 // splicer end class.ConfigManager.CXX_definitions

diff --git a/src/interface/caliper_shroud.yaml b/src/interface/caliper_shroud.yaml
@@ -118,7 +118,7 @@ declarations:
       - decl: void end()
 
   - decl: class ConfigManager
-    cxx_header: caliper/cali-manager.h
+    cxx_header: caliper/ConfigManager.h
     declarations:
       - decl: ConfigManager()  +name(new)
       - decl: ~ConfigManager() +name(delete)

diff --git a/test/ci_app_tests/CMakeLists.txt b/test/ci_app_tests/CMakeLists.txt
@@ -1,4 +1,5 @@
 include_directories("../../src/caliper")
+include_directories("../../src/interface/c_fortran")
 
 # build the C/C++ CI test apps