Merge branch 'fix-gui-shared' into 'master'

[CMake] Fixed gui shared build.

See merge request ogs/ogs!3554

Applications/DataExplorer/DataView/CMakeLists.txt

@@ -131,7 +131,7 @@ if(GEOTIFF_FOUND)
     include_directories(${GEOTIFF_INCLUDE_DIRS})
 endif() # GEOTIFF_FOUND
 
-ogs_add_library(QtDataView ${SOURCES} ${HEADERS} ${UIS})
+ogs_add_library(QtDataView STATIC ${SOURCES} ${HEADERS} ${UIS})
 
 target_link_libraries(
     QtDataView

Applications/DataExplorer/VtkVis/CMakeLists.txt

@@ -132,7 +132,7 @@ include_directories(
     ${GUI_SOURCE_DIR_REL}/VtkModules/Qt
 )
 
-ogs_add_library(VtkVis ${SOURCES} ${HEADERS} ${UIS})
+ogs_add_library(VtkVis STATIC ${SOURCES} ${HEADERS} ${UIS})
 
 if(GEOTIFF_FOUND)
     target_compile_definitions(VtkVis PRIVATE GEOTIFF_FOUND)

scripts/cmake/Functions.cmake

@@ -83,12 +83,20 @@ endfunction()
 
 # Replacement for add_library() for ogs targets
 function(ogs_add_library targetName)
-    foreach(file ${ARGN})
+    set(options STATIC SHARED)
+    cmake_parse_arguments(ogs_add_library "${options}" "" "" ${ARGN})
+
+    foreach(file ${ogs_add_library_UNPARSED_ARGUMENTS})
         get_filename_component(file_path ${file} REALPATH)
         list(APPEND files ${file_path})
     endforeach()
 
-    add_library(${targetName} ${files})
+    if(ogs_add_library_STATIC)
+        set(TYPE STATIC)
+    elseif(ogs_add_library_SHARED)
+        set(TYPE SHARED)
+    endif()
+    add_library(${targetName} ${TYPE} ${files})
     target_compile_options(
         ${targetName}
         PRIVATE # OR does not work with cotire