Fixed Building grass with Ubuntu System Libraries and cmake

Mahesh1998 · Jul 17, 2024 · 8291252 · 8291252
1 parent e446882
commit 8291252
Show file tree

Hide file tree

Showing 14 changed files with 184 additions and 88 deletions.
diff --git a/display/CMakeLists.txt b/display/CMakeLists.txt
@@ -81,7 +81,7 @@ if(WITH_DOCS)
           DESTINATION ${GRASS_INSTALL_DOCDIR})
 endif()
 build_program_in_subdir(d.grid DEPENDS grass_gis grass_symb grass_gproj
-                        grass_display LIBM)
+                        grass_display GDAL LIBM)
 build_program_in_subdir(d.his DEPENDS grass_gis grass_display grass_raster)
 build_program_in_subdir(d.histogram DEPENDS grass_gis grass_display
                         grass_raster LIBM)
@@ -103,7 +103,7 @@ if(WITH_DOCS)
   install(DIRECTORY ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/northarrows
           DESTINATION ${GRASS_INSTALL_DOCDIR})
 endif()
-build_program_in_subdir(d.path DEPENDS grass_gis grass_display grass_vector)
+build_program_in_subdir(d.path DEPENDS grass_gis grass_display grass_vector GDAL)
 build_program_in_subdir(d.profile DEPENDS grass_gis grass_display grass_raster LIBM)
 build_program_in_subdir(d.rast DEPENDS grass_gis grass_display grass_raster)
 build_program_in_subdir(d.rast.arrow DEPENDS grass_gis grass_raster
@@ -125,6 +125,7 @@ build_program_in_subdir(
   grass_raster
   grass_symb
   grass_vector
+  GDAL
   LIBM)
 build_program_in_subdir(
   d.vect.chart
@@ -136,6 +137,7 @@ build_program_in_subdir(
   grass_gis
   grass_symb
   grass_vector
+  GDAL
   LIBM)
 build_program_in_subdir(
   d.vect.thematic
@@ -147,5 +149,6 @@ build_program_in_subdir(
   grass_display
   grass_gis
   grass_symb
-  grass_vector)
-build_program_in_subdir(d.where DEPENDS grass_gis grass_display grass_gproj)
+  grass_vector
+  GDAL)
+build_program_in_subdir(d.where DEPENDS grass_gis grass_display grass_gproj GDAL)
diff --git a/general/CMakeLists.txt b/general/CMakeLists.txt
@@ -35,6 +35,7 @@ build_program_in_subdir(
   grass_raster3d
   grass_gmath
   PROJ
+  GDAL
   LIBM)
 
 build_program_in_subdir(g.rename DEPENDS grass_gis grass_manage grass_raster)
@@ -72,7 +73,8 @@ build_program_in_subdir(
   grass_manage
   grass_raster
   grass_raster3d
-  grass_vector)
+  grass_vector
+  GDAL)
 add_dependencies(g.list cell vector)
 
 build_program_in_subdir(g.remove DEPENDS grass_gis grass_manage grass_raster)

diff --git a/general/manage/lister/CMakeLists.txt b/general/manage/lister/CMakeLists.txt
@@ -22,6 +22,7 @@ build_program(
   grass_dbmibase
   grass_gis
   grass_raster
+  GDAL
   RUNTIME_OUTPUT_DIR
   "${GRASS_INSTALL_ETCDIR}/lister"
   NO_DOCS)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -146,7 +146,7 @@ add_subdirectory(fonts)
 
 add_subdirectory(vector)
 
-build_library_in_subdir(imagery DEPENDS grass_gis grass_vector grass_raster)
+build_library_in_subdir(imagery DEPENDS grass_gis grass_vector grass_raster GDAL)
 
 build_library_in_subdir(cluster DEPENDS grass_imagery grass_gis grass_raster)
 
@@ -168,6 +168,7 @@ build_library_in_subdir(
   grass_dbmidriver
   grass_gmath
   grass_segment
+  GDAL
   HEADERS
   "lidar.h")
 
@@ -181,7 +182,8 @@ build_program_in_subdir(
   DEPENDS
   grass_gis
   grass_raster3d
-  grass_raster)
+  grass_raster
+  GDAL)
 
 build_library_in_subdir(
   gpde
@@ -217,7 +219,7 @@ build_library_in_subdir(stats DEPENDS grass_gis grass_raster)
 
 build_library_in_subdir(arraystats DEPENDS grass_gis)
 
-if(WITH_OPENGL)
+if(WITH_OPENGL AND OPENGL_GLU_FOUND AND OpenGL_GLX_FOUND)
   build_library_in_subdir(
     ogsf
     DEPENDS
@@ -229,6 +231,7 @@ if(WITH_OPENGL)
     grass_raster
     grass_raster3d
     grass_vector
+    GDAL
     OPENGL
     TIFF)
 
@@ -250,7 +253,7 @@ add_subdirectory(temporal)
 build_library_in_subdir(iostream SRC_REGEX "*.cpp" DEPENDS grass_gis)
 
 build_library_in_subdir(manage DEPENDS grass_gis grass_raster grass_vector
-                        grass_raster3d)
+                        grass_raster3d GDAL)
 file(COPY manage/element_list DESTINATION ${OUTDIR}/${GRASS_INSTALL_ETCDIR})
 install(FILES ${OUTDIR}/${GRASS_INSTALL_ETCDIR}/element_list
         DESTINATION ${GRASS_INSTALL_ETCDIR})

diff --git a/lib/rst/CMakeLists.txt b/lib/rst/CMakeLists.txt
@@ -33,6 +33,7 @@ build_library_in_subdir(
   grass_vector
   grass_qtree
   grass_interpdata
+  GDAL
   LIBM
   OPTIONAL_DEPENDS
   OPENMP

diff --git a/lib/vector/CMakeLists.txt b/lib/vector/CMakeLists.txt
@@ -42,7 +42,8 @@ build_library_in_subdir(
   grass_vector
   grass_dbmibase
   grass_dbmiclient
-  grass_dbmidriver)
+  grass_dbmidriver
+  GDAL)
 
 build_library_in_subdir(
   neta
@@ -54,7 +55,8 @@ build_library_in_subdir(
   grass_dbmidriver
   grass_gis
   grass_dgl
-  grass_vector)
+  grass_vector
+  GDAL)
 
 if(WITH_DOCS)
   generate_html(TARGET grass_vector NAME vectorascii)

diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
@@ -5,7 +5,7 @@ build_program_in_subdir(m.measure DEPENDS grass_gis)
 build_program_in_subdir(m.transform DEPENDS grass_gis grass_imagery
                         grass_raster grass_vector LIBM)
 
-if(WITH_OPENGL)
+if(TARGET grass_ogsf)
   build_program_in_subdir(
     m.nviz.image
     DEPENDS
@@ -19,4 +19,4 @@ if(WITH_OPENGL)
 
   build_program_in_subdir(m.nviz.script DEPENDS grass_display grass_raster
                           grass_gis LIBM)
-endif(WITH_OPENGL)
+endif(TARGET grass_ogsf)
diff --git a/ps/CMakeLists.txt b/ps/CMakeLists.txt
@@ -11,6 +11,7 @@ build_program_in_subdir(
   grass_dbmiclient
   grass_dbmidriver
   grass_symb
+  GDAL
   LIBM)
 
 add_custom_command(

diff --git a/python/libgrass_interface_generator/CMakeLists.txt b/python/libgrass_interface_generator/CMakeLists.txt
@@ -18,7 +18,7 @@ set(MODULES
     rowio
     temporal)
 
-if(WITH_OPENGL)
+if(TARGET grass_ogsf)
   list(APPEND MODULES ogsf nviz)
 endif()
 

diff --git a/raster/CMakeLists.txt b/raster/CMakeLists.txt
@@ -161,6 +161,7 @@ build_program_in_subdir(
   grass_vector
   grass_bitmap
   grass_dig2
+  GDAL
   LIBM)
 
 build_program_in_subdir(r.category DEPENDS grass_gis grass_raster)
@@ -188,10 +189,11 @@ build_program_in_subdir(
   grass_dbmibase
   grass_dbmiclient
   grass_dbmidriver
+  GDAL
   LIBM)
 
 build_program_in_subdir(r.cost DEPENDS grass_gis grass_raster grass_segment
-                        grass_vector LIBM)
+                        grass_vector GDAL LIBM)
 
 build_program_in_subdir(r.covar DEPENDS grass_gis grass_raster LIBM)
 
@@ -226,6 +228,7 @@ build_program_in_subdir(
   grass_segment
   grass_vector
   grass_bitmap
+  GDAL
   LIBM)
 
 build_program_in_subdir(r.geomorphon DEPENDS grass_gis grass_raster grass_gmath LIBM)
@@ -238,7 +241,7 @@ build_program_in_subdir(r.gwflow DEPENDS grass_gis grass_raster grass_gpde
 build_program_in_subdir(r.his DEPENDS grass_gis grass_raster grass_gproj)
 
 build_program_in_subdir(r.horizon DEPENDS grass_gis grass_raster grass_gproj
-                        grass_parson LIBM)
+                        grass_parson GDAL LIBM)
 
 build_program_in_subdir(r.in.ascii DEPENDS grass_gis grass_raster)
 
@@ -270,6 +273,7 @@ build_program_in_subdir(
   grass_gmath
   grass_segment
   grass_gproj
+  GDAL
   LIBM
   PRIMARY_DEPENDS
   PDAL)
@@ -288,7 +292,7 @@ build_program_in_subdir(r.info TEST_SOURCES "test_r_info.py" DEPENDS grass_gis L
 
 build_program_in_subdir(r.kappa DEPENDS grass_gis grass_raster LIBM)
 
-build_program_in_subdir(r.latlong DEPENDS grass_gis grass_raster grass_gproj)
+build_program_in_subdir(r.latlong DEPENDS grass_gis grass_raster grass_gproj GDAL)
 
 build_program_in_subdir(r.lake DEPENDS grass_gis grass_raster)
 
@@ -374,7 +378,7 @@ build_program_in_subdir(
 build_program_in_subdir(r.patch DEPENDS grass_gis grass_raster OPTIONAL_DEPENDS
                         OPENMP)
 
-build_program_in_subdir(r.path DEPENDS grass_gis grass_raster grass_vector)
+build_program_in_subdir(r.path DEPENDS grass_gis grass_raster grass_vector GDAL)
 
 build_program_in_subdir(r.profile DEPENDS grass_gis grass_raster grass_parson LIBM)
 
@@ -384,6 +388,7 @@ build_program_in_subdir(
   grass_gis
   grass_raster
   grass_gproj
+  GDAL
   LIBM
   OPTIONAL_DEPENDS
   OPENMP)
@@ -401,6 +406,7 @@ build_program_in_subdir(
   grass_dbmibase
   grass_dbmiclient
   grass_dbmidriver
+  GDAL
   LIBM)
 
 build_program_in_subdir(r.random.cells DEPENDS grass_gis grass_raster LIBM)
@@ -411,7 +417,7 @@ build_program_in_subdir(r.reclass DEPENDS grass_gis grass_raster grass_manage)
 
 build_program_in_subdir(r.recode DEPENDS grass_gis grass_raster)
 
-build_program_in_subdir(r.region DEPENDS grass_gis grass_raster grass_vector)
+build_program_in_subdir(r.region DEPENDS grass_gis grass_raster grass_vector GDAL)
 
 build_program_in_subdir(r.regression.line DEPENDS grass_gis grass_raster LIBM)
 
@@ -428,6 +434,7 @@ build_program_in_subdir(
   grass_vector
   grass_segment
   grass_lidar
+  GDAL
   LIBM)
 
 build_program_in_subdir(r.resamp.filter DEPENDS grass_gis grass_raster LIBM
@@ -444,7 +451,9 @@ build_program_in_subdir(
   grass_gmath
   grass_interpfl
   grass_interpdata
-  grass_qtree)
+  grass_qtree
+  GDAL)
+
 
 build_program_in_subdir(r.resamp.stats DEPENDS grass_gis grass_raster
                         grass_stats LIBM)
@@ -511,6 +520,7 @@ build_program_in_subdir(
   grass_dbmibase
   grass_dbmiclient
   grass_dbmidriver
+  GDAL
   LIBM)
 
 build_program_in_subdir(
@@ -520,13 +530,14 @@ build_program_in_subdir(
   grass_gmath
   grass_raster
   grass_gproj
+  GDAL
   LIBM
   OPTIONAL_DEPENDS
   OPENMP)
 
-build_program_in_subdir(r.sunhours DEPENDS grass_gis grass_raster grass_gproj LIBM)
+build_program_in_subdir(r.sunhours DEPENDS grass_gis grass_raster grass_gproj GDAL LIBM)
 
-build_program_in_subdir(r.sunmask DEPENDS grass_gis grass_raster grass_gproj LIBM)
+build_program_in_subdir(r.sunmask DEPENDS grass_gis grass_raster grass_gproj GDAL LIBM)
 
 build_program_in_subdir(r.support DEPENDS grass_gis grass_raster)
 
@@ -574,7 +585,8 @@ build_program_in_subdir(
   grass_vector
   grass_dbmibase
   grass_dbmiclient
-  grass_dbmidriver)
+  grass_dbmidriver
+  GDAL)
 
 build_program_in_subdir(r.topidx DEPENDS grass_gis grass_raster LIBM)
 
@@ -596,15 +608,16 @@ build_program_in_subdir(
   grass_vector
   grass_dbmibase
   grass_dbmiclient
-  grass_dbmidriver)
+  grass_dbmidriver
+  GDAL)
 
 build_program_in_subdir(r.walk DEPENDS grass_gis grass_raster grass_segment
-                        grass_vector LIBM)
+                        grass_vector GDAL LIBM)
 
 build_program_in_subdir(r.water.outlet DEPENDS grass_gis grass_raster)
 
 build_program_in_subdir(r.what DEPENDS grass_gis grass_raster grass_vector
-                        grass_parson)
+                        grass_parson GDAL)
 
 build_program_in_subdir(r.what.color DEPENDS grass_gis grass_raster)
 

diff --git a/raster/r.sim/CMakeLists.txt b/raster/r.sim/CMakeLists.txt
@@ -8,6 +8,7 @@ build_library_in_subdir(
   grass_raster
   grass_vector
   grass_gmath
+  GDAL
   LIBM
   OPTIONAL_DEPENDS
   OPENMP
@@ -21,6 +22,7 @@ build_program_in_subdir(
   grass_gis
   grass_gmath
   grass_sim
+  GDAL
   OPTIONAL_DEPENDS
   OPENMP
   INCLUDES
@@ -32,6 +34,7 @@ build_program_in_subdir(
   grass_gis
   grass_gmath
   grass_sim
+  GDAL
   OPTIONAL_DEPENDS
   OPENMP
   INCLUDES

diff --git a/raster3d/r3.flow/CMakeLists.txt b/raster3d/r3.flow/CMakeLists.txt
@@ -13,6 +13,7 @@ build_program(
   grass_raster
   grass_raster3d
   grass_vector
+  GDAL
   LIBM)
 
 set(test_r3flow_SRCS test_main.c flowline.c integrate.c interpolate.c
@@ -31,4 +32,5 @@ build_program(
   grass_dbmiclient
   grass_dbmidriver
   grass_vector
+  GDAL
   LIBM)