Merge pull request #99 from GEOS-ESM/develop

Git Flow Pull develop into master
GEOS-ESM · Jun 3, 2020 · fa505db · fa505db
2 parents 0b65110 + 026ca08
commit fa505db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -2,7 +2,7 @@
 required = True
 repo_url = git@github.com:GEOS-ESM/ecbuild.git
 local_path = ./@ecbuild
-tag = geos/v1.0.1
+tag = geos/v1.0.5
 protocol = git
 
 [externals_description]

diff --git a/esma_add_library.cmake b/esma_add_library.cmake
@@ -13,7 +13,7 @@ macro (esma_add_library this)
     message (STATUS "Generating build instructions for component: ${this}")
   endif ()
 
-  set (options EXCLUDE_FROM_ALL)
+  set (options EXCLUDE_FROM_ALL NOINSTALL)
   set (oneValueArgs
     # shared with ecbuild
     TYPE)	
@@ -87,11 +87,15 @@ macro (esma_add_library this)
   if (ARGS_TYPE)
     set(ARGS_TYPE TYPE ${ARGS_TYPE})
   endif()
+  if (ARGS_NOINSTALL)
+    set(NOINSTALL_ "NOINSTALL")
+  endif()
   ecbuild_add_library (TARGET ${this}
     SOURCES ${ARGS_SOURCES}
     PUBLIC_LIBS ${all_dependencies}
     PUBLIC_INCLUDES ${ARGS_PUBLIC_INCLUDES}
     ${ARGS_TYPE}
+    ${NOINSTALL_}
     )
 
   set_target_properties(${this} PROPERTIES EXCLUDE_FROM_ALL ${ARGS_EXCLUDE_FROM_ALL})