diff --git a/CMakeLists.txt b/CMakeLists.txt index f57f1c9eb..ef9da1dde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,12 +70,6 @@ find_package(ip 3.3.3 REQUIRED) find_package(g2 3.4.3 REQUIRED) find_package(sigio 2.3.0 REQUIRED) -# EMC requires executables in ./exec -set(exec_dir bin) -if(EMC_EXEC_DIR) - set(exec_dir exec) -endif() - # If doxygen documentation we enabled, build it. This must come before # adding the source code directories; the main documentation build # must happen before any of the utility document builds. diff --git a/build_all.sh b/build_all.sh index d67ed5038..549bb839d 100755 --- a/build_all.sh +++ b/build_all.sh @@ -25,17 +25,18 @@ else set -x fi + # The unit test data download is part of the build system. Not all machines can # access the EMC ftp site, so turn off the build (-DBUILD_TESTING=OFF) of the units tests accordingly. # Those with access to the EMC ftp site are: Orion and Hera. if [[ "$target" == "hera" || "$target" == "orion" || "$target" == "wcoss2" ]]; then - CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DBUILD_TESTING=OFF" - #CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DBUILD_TESTING=ON" - #CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DENABLE_DOCS=ON -DBUILD_TESTING=ON" + CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DCMAKE_INSTALL_BINDIR=exec -DBUILD_TESTING=OFF" + #CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DCMAKE_INSTALL_BINDIR=exec -DBUILD_TESTING=ON" + #CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DCMAKE_INSTALL_BINDIR=exec -DENABLE_DOCS=ON -DBUILD_TESTING=ON" else - CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DBUILD_TESTING=OFF" - #CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DEMC_EXEC_DIR=ON -DENABLE_DOCS=ON -DBUILD_TESTING=OFF" + CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DCMAKE_INSTALL_BINDIR=exec -DBUILD_TESTING=OFF" + #CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=../ -DCMAKE_INSTALL_BINDIR=exec -DENABLE_DOCS=ON -DBUILD_TESTING=OFF" fi rm -fr ./build diff --git a/sorc/chgres_cube.fd/CMakeLists.txt b/sorc/chgres_cube.fd/CMakeLists.txt index 0fc64ff32..3d4cc8144 100644 --- a/sorc/chgres_cube.fd/CMakeLists.txt +++ b/sorc/chgres_cube.fd/CMakeLists.txt @@ -62,7 +62,7 @@ endif() target_link_libraries(${exe_name} PRIVATE chgres_cube_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS) diff --git a/sorc/cpld_gridgen.fd/CMakeLists.txt b/sorc/cpld_gridgen.fd/CMakeLists.txt index 7087d0589..0cdfc3540 100644 --- a/sorc/cpld_gridgen.fd/CMakeLists.txt +++ b/sorc/cpld_gridgen.fd/CMakeLists.txt @@ -54,7 +54,7 @@ endif() target_link_libraries(${exe_name} PRIVATE cpld_gridgen_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS) diff --git a/sorc/emcsfc_ice_blend.fd/CMakeLists.txt b/sorc/emcsfc_ice_blend.fd/CMakeLists.txt index 9373c4c9c..79568e84a 100644 --- a/sorc/emcsfc_ice_blend.fd/CMakeLists.txt +++ b/sorc/emcsfc_ice_blend.fd/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries( g2::g2_4 w3nco::w3nco_4) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS) diff --git a/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt b/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt index d43ca3c01..b20a722ee 100644 --- a/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt +++ b/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt @@ -41,7 +41,7 @@ endif() target_link_libraries(${exe_name} PRIVATE snow2mdl_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS) diff --git a/sorc/fre-nctools.fd/tools/fregrid/CMakeLists.txt b/sorc/fre-nctools.fd/tools/fregrid/CMakeLists.txt index c80a13eb4..920a4ee25 100644 --- a/sorc/fre-nctools.fd/tools/fregrid/CMakeLists.txt +++ b/sorc/fre-nctools.fd/tools/fregrid/CMakeLists.txt @@ -17,4 +17,4 @@ target_link_libraries(fregrid_lib target_link_libraries(fregrid PRIVATE fregrid_lib) -install(TARGETS fregrid RUNTIME DESTINATION ${exec_dir}) +install(TARGETS fregrid) diff --git a/sorc/fre-nctools.fd/tools/make_hgrid/CMakeLists.txt b/sorc/fre-nctools.fd/tools/make_hgrid/CMakeLists.txt index b0d9070a1..be5a5fdbd 100644 --- a/sorc/fre-nctools.fd/tools/make_hgrid/CMakeLists.txt +++ b/sorc/fre-nctools.fd/tools/make_hgrid/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(make_hgrid_lib target_link_libraries(make_hgrid PRIVATE make_hgrid_lib) -install(TARGETS make_hgrid RUNTIME DESTINATION ${exec_dir}) +install(TARGETS make_hgrid) diff --git a/sorc/fre-nctools.fd/tools/make_solo_mosaic/CMakeLists.txt b/sorc/fre-nctools.fd/tools/make_solo_mosaic/CMakeLists.txt index e4507eff9..5dbacc311 100644 --- a/sorc/fre-nctools.fd/tools/make_solo_mosaic/CMakeLists.txt +++ b/sorc/fre-nctools.fd/tools/make_solo_mosaic/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(make_solo_mosaic_lib target_link_libraries(make_solo_mosaic PRIVATE make_solo_mosaic_lib) -install(TARGETS make_solo_mosaic RUNTIME DESTINATION ${exec_dir}) +install(TARGETS make_solo_mosaic) diff --git a/sorc/fvcom_tools.fd/CMakeLists.txt b/sorc/fvcom_tools.fd/CMakeLists.txt index 533435083..88d028b4a 100644 --- a/sorc/fvcom_tools.fd/CMakeLists.txt +++ b/sorc/fvcom_tools.fd/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries( target_link_libraries(${exe_name} PRIVATE fvcom_tools_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS) diff --git a/sorc/global_cycle.fd/CMakeLists.txt b/sorc/global_cycle.fd/CMakeLists.txt index a6957be7f..ede7ada35 100644 --- a/sorc/global_cycle.fd/CMakeLists.txt +++ b/sorc/global_cycle.fd/CMakeLists.txt @@ -50,7 +50,7 @@ endif() target_link_libraries(${exe_name} PRIVATE global_cycle_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS) diff --git a/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt b/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt index 74f2c3850..0f1db12b7 100644 --- a/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt +++ b/sorc/grid_tools.fd/filter_topo.fd/CMakeLists.txt @@ -26,4 +26,4 @@ target_link_libraries( target_link_libraries(${exe_name} PRIVATE filter_topo_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) diff --git a/sorc/grid_tools.fd/global_equiv_resol.fd/CMakeLists.txt b/sorc/grid_tools.fd/global_equiv_resol.fd/CMakeLists.txt index 549735ac1..042eaa5f6 100644 --- a/sorc/grid_tools.fd/global_equiv_resol.fd/CMakeLists.txt +++ b/sorc/grid_tools.fd/global_equiv_resol.fd/CMakeLists.txt @@ -7,4 +7,4 @@ target_link_libraries( ${exe_name} NetCDF::NetCDF_Fortran) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) diff --git a/sorc/grid_tools.fd/regional_esg_grid.fd/CMakeLists.txt b/sorc/grid_tools.fd/regional_esg_grid.fd/CMakeLists.txt index 592290472..8cfb2706e 100644 --- a/sorc/grid_tools.fd/regional_esg_grid.fd/CMakeLists.txt +++ b/sorc/grid_tools.fd/regional_esg_grid.fd/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries( ${exe_name} NetCDF::NetCDF_Fortran) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) diff --git a/sorc/grid_tools.fd/shave.fd/CMakeLists.txt b/sorc/grid_tools.fd/shave.fd/CMakeLists.txt index 6f75df2df..614e9ba94 100644 --- a/sorc/grid_tools.fd/shave.fd/CMakeLists.txt +++ b/sorc/grid_tools.fd/shave.fd/CMakeLists.txt @@ -7,4 +7,4 @@ target_link_libraries( ${exe_name} NetCDF::NetCDF_Fortran) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) diff --git a/sorc/orog_mask_tools.fd/inland.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/inland.fd/CMakeLists.txt index 82885890e..189cd17e7 100644 --- a/sorc/orog_mask_tools.fd/inland.fd/CMakeLists.txt +++ b/sorc/orog_mask_tools.fd/inland.fd/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries( target_link_libraries(inland PRIVATE inland_lib) -install(TARGETS inland RUNTIME DESTINATION ${exec_dir}) +install(TARGETS inland) diff --git a/sorc/orog_mask_tools.fd/lake.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/lake.fd/CMakeLists.txt index afeab7ddb..1b9b2108f 100644 --- a/sorc/orog_mask_tools.fd/lake.fd/CMakeLists.txt +++ b/sorc/orog_mask_tools.fd/lake.fd/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries( target_link_libraries(lakefrac PRIVATE lakefrac_lib) -install(TARGETS lakefrac RUNTIME DESTINATION ${exec_dir}) +install(TARGETS lakefrac) diff --git a/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt index e84d9cbee..c292ec530 100644 --- a/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt +++ b/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt @@ -34,4 +34,4 @@ endif() target_link_libraries(orog PRIVATE orog_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) diff --git a/sorc/orog_mask_tools.fd/orog_gsl.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/orog_gsl.fd/CMakeLists.txt index 467789e79..6499db583 100644 --- a/sorc/orog_mask_tools.fd/orog_gsl.fd/CMakeLists.txt +++ b/sorc/orog_mask_tools.fd/orog_gsl.fd/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries( target_link_libraries(${exe_name} PRIVATE orog_gsl_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) diff --git a/sorc/sfc_climo_gen.fd/CMakeLists.txt b/sorc/sfc_climo_gen.fd/CMakeLists.txt index e6f2bc7b6..f5e3b9186 100644 --- a/sorc/sfc_climo_gen.fd/CMakeLists.txt +++ b/sorc/sfc_climo_gen.fd/CMakeLists.txt @@ -38,7 +38,7 @@ target_link_libraries( target_link_libraries(${exe_name} PRIVATE sfc_climo_gen_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS) diff --git a/sorc/vcoord_gen.fd/CMakeLists.txt b/sorc/vcoord_gen.fd/CMakeLists.txt index f86b0a676..328e2ab15 100644 --- a/sorc/vcoord_gen.fd/CMakeLists.txt +++ b/sorc/vcoord_gen.fd/CMakeLists.txt @@ -27,7 +27,7 @@ target_include_directories(vcoord_gen_lib INTERFACE ${mod_dir}) target_link_libraries(${exe_name} vcoord_gen_lib) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. diff --git a/sorc/weight_gen.fd/CMakeLists.txt b/sorc/weight_gen.fd/CMakeLists.txt index 41de1fb6c..8d8e05db7 100644 --- a/sorc/weight_gen.fd/CMakeLists.txt +++ b/sorc/weight_gen.fd/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries( sp::sp_d NetCDF::NetCDF_Fortran) -install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir}) +install(TARGETS ${exe_name}) # If doxygen documentation we enabled, build it. if(ENABLE_DOCS)