Merge pull request #1850 from bilke/32bit-de

[Jenkins] Don't build cli on 32-bit Windows builds

Applications/DataExplorer/DataExplorer.cmake

@@ -47,7 +47,6 @@ add_executable(DataExplorer
 target_link_libraries(DataExplorer
     BaseLib
     GeoLib
-    MeshGeoToolsLib
     MeshLib
     ApplicationsFileIO
     DataHolderLib

Applications/Utils/OGSFileConverter/CMakeLists.txt

@@ -20,18 +20,16 @@ add_library(OGSFileConverterLib
     ${UIS}
 )
 target_link_libraries(OGSFileConverterLib
-    QtBase
-    MeshLib
-    NumLib
+    PUBLIC QtBase MathLib
+    INTERFACE MeshLib
 )
+ADD_VTK_DEPENDENCY(OGSFileConverterLib)
 
 add_executable(OGSFileConverter main.cpp)
 
 target_link_libraries(OGSFileConverter
-    ApplicationsLib
     OGSFileConverterLib
-    QtBase
-    GeoLib)
+)
 ADD_VTK_DEPENDENCY(OGSFileConverter)
 
 set_property(TARGET OGSFileConverter PROPERTY FOLDER "Utilities")

CMakeLists.txt

@@ -249,12 +249,14 @@ if(TARGET Boost)
     add_dependencies(BaseLib Boost)
 endif()
 add_subdirectory( GeoLib )
-add_subdirectory( MaterialLib )
 add_subdirectory( MathLib )
 add_subdirectory( MeshLib )
 add_subdirectory( MeshGeoToolsLib )
 add_subdirectory( NumLib )
-add_subdirectory( ProcessLib )
+if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR OGS_BUILD_TESTS)
+    add_subdirectory( MaterialLib )
+    add_subdirectory( ProcessLib )
+endif()
 if( OGS_BUILD_TESTS AND NOT IS_SUBPROJECT )
     add_subdirectory( Tests )
 

scripts/jenkins/msvc32.groovy

@@ -3,13 +3,11 @@ def defaultCMakeOptions =
     '-DOGS_32_BIT=ON ' +
     '-DOGS_LIB_BOOST=System ' +
     '-DOGS_LIB_VTK=System ' +
-    '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON '
-
-def guiCMakeOptions =
+    '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' +
     '-DOGS_BUILD_GUI=ON ' +
-    '-DOGS_BUILD_UTILS=ON ' +
+    '-DOGS_BUILD_UTILS=OFF ' +
     '-DOGS_BUILD_TESTS=OFF ' +
-    '-DOGS_BUILD_METIS=ON '
+    '-DOGS_BUILD_CLI=OFF'
 
 def configure = new ogs.configure()
 def build = new ogs.build()
@@ -21,7 +19,7 @@ withEnv(helper.getEnv(this, 'x32')) {
     stage('Data Explorer 32-bit (Win)') {
         configure.win(
             arch: 'x86',
-            cmakeOptions: defaultCMakeOptions + guiCMakeOptions,
+            cmakeOptions: defaultCMakeOptions,
             conanOptions: "-o gui=True",
             script: this
         )