Merge pull request #2 from andrew-platt/f/CCT2-IFW_wrapper

Updated error handling in ifw_c_lib
andrew-platt · May 25, 2021 · 9f99279 · 9f99279
2 parents e37356e + 92d7d67
commit 9f99279
Show file tree

Hide file tree

Showing 25 changed files with 1,168 additions and 11,724 deletions.
diff --git a/modules/inflowwind/CMakeLists.txt b/modules/inflowwind/CMakeLists.txt
@@ -51,17 +51,8 @@ set(IFW_SOURCES
 add_library(ifwlib ${IFW_SOURCES})
 target_link_libraries(ifwlib nwtclibs)
 
-# LINUX
-add_library(ifw_c_lib driver/IFW_C.f90)
-
-# MAC
-# add_library(ifw_c_lib SHARED driver/IFW_C.f90 ${IFW_SOURCES})
-# set_target_properties(ifw_c_lib PROPERTIES PREFIX "" SUFFIX ".dylib")
-
-# WINDOWS
-# add_library(ifw_c_lib SHARED driver/IFW_C.f90 ${IFW_SOURCES})
-# set_target_properties(ifw_c_lib PROPERTIES PREFIX "" SUFFIX ".dll")
-
+# c-bindings interface library
+add_library(ifw_c_lib SHARED src/IfW_C.f90)
 target_link_libraries(ifw_c_lib ifwlib)
 
 set(IFW_DRIVER_SOURCES
@@ -73,7 +64,7 @@ set(IFW_DRIVER_SOURCES
 add_executable(inflowwind_driver ${IFW_DRIVER_SOURCES})
 target_link_libraries(inflowwind_driver ifwlib ${CMAKE_DL_LIBS})
 
-install(TARGETS inflowwind_driver ifwlib
+install(TARGETS inflowwind_driver ifwlib ifw_c_lib
  EXPORT "${CMAKE_PROJECT_NAME}Libraries"
  RUNTIME DESTINATION bin
  LIBRARY DESTINATION lib

diff --git a/modules/inflowwind/driver/IFW_C.f90 b/modules/inflowwind/driver/IFW_C.f90