simplification and cleaning

NOAA-GSL · Oct 26, 2023 · 9555665 · 9555665
1 parent d45f06b
commit 9555665
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/blending/chgres_winds/CMakeLists.txt b/blending/chgres_winds/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(chgres_winds)
 
-#set(CFLAGS "-std=c99")
 # Find the path to libiomp5.so
 find_library(LIBIOMP5_PATH NAMES libiomp5.so)
 set(FCODE ${CMAKE_CURRENT_SOURCE_DIR}/chgres_winds.f90)
@@ -13,4 +12,6 @@ execute_process(
     RESULT_VARIABLE F2PY_RESULT
 )
 
-install(SCRIPT "installSO.CMake") 
+#install chgres_winds.so
+file(GLOB_RECURSE SOFILE "${CMAKE_CURRENT_BINARY_DIR}/*chgres_winds*.so")
+install(FILES ${SOFILE} DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME chgres_winds.so)
diff --git a/blending/chgres_winds/installSO.CMake b/blending/chgres_winds/installSO.CMake
diff --git a/blending/raymond/CMakeLists.txt b/blending/raymond/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(raymond)
 
-#set(CFLAGS "-std=c99")
 set(FCODE ${CMAKE_CURRENT_SOURCE_DIR}/raymond.f)
 
 # Compile the Fortran code using f2py
@@ -11,4 +10,6 @@ execute_process(
     RESULT_VARIABLE F2PY_RESULT
 )
 
-install(SCRIPT "installSO.CMake")
+#install raymond.so
+file(GLOB_RECURSE SOFILE "${CMAKE_CURRENT_BINARY_DIR}/*raymond*.so")
+install(FILES ${SOFILE} DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME raymond.so)
diff --git a/blending/raymond/installSO.CMake b/blending/raymond/installSO.CMake
diff --git a/blending/remap_dwinds/CMakeLists.txt b/blending/remap_dwinds/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(remap_dwinds)
 
-#set(CFLAGS "-std=c99")
 # Find the path to libiomp5.so
 find_library(LIBIOMP5_PATH NAMES libiomp5.so)
 set(FCODE ${CMAKE_CURRENT_SOURCE_DIR}/remap_dwinds.f90)
@@ -13,4 +12,6 @@ execute_process(
     RESULT_VARIABLE F2PY_RESULT
 )
 
-install(SCRIPT "installSO.CMake") 
+#install remap_dwinds.so
+file(GLOB_RECURSE SOFILE "${CMAKE_CURRENT_BINARY_DIR}/*remap_dwinds*.so")
+install(FILES ${SOFILE} DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME remap_dwinds.so)
diff --git a/blending/remap_dwinds/installSO.CMake b/blending/remap_dwinds/installSO.CMake
diff --git a/blending/remap_scalar/CMakeLists.txt b/blending/remap_scalar/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(remap_scalar)
 
-#set(CFLAGS "-std=c99")
 # Find the path to libiomp5.so
 find_library(LIBIOMP5_PATH NAMES libiomp5.so)
 set(FCODE ${CMAKE_CURRENT_SOURCE_DIR}/remap_scalar.f90)
@@ -13,4 +12,6 @@ execute_process(
     RESULT_VARIABLE F2PY_RESULT
 )
 
-install(SCRIPT "installSO.CMake") 
+#install remap_scalar.so
+file(GLOB_RECURSE SOFILE "${CMAKE_CURRENT_BINARY_DIR}/*remap_scalar*.so")
+install(FILES ${SOFILE} DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME remap_scalar.so)
diff --git a/blending/remap_scalar/installSO.CMake b/blending/remap_scalar/installSO.CMake