Skip to content

Commit

Permalink
fix CI 12
Browse files Browse the repository at this point in the history
  • Loading branch information
@nilason
nilason committed May 24, 2024
1 parent 65036e3 commit 7b117ff
Show file tree
Hide file tree
Showing 18 changed files with 163 additions and 101 deletions.
5 changes: 3 additions & 2 deletions cmake/modules/CheckDependentLibraries.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ find_package(FLEX REQUIRED)
find_package(BISON REQUIRED)

if(UNIX)
find_library(M_LIBRARY m)
find_library(MATH_LIBRARY m)
add_library(LIBM INTERFACE IMPORTED GLOBAL)
set_property(TARGET LIBM PROPERTY INTERFACE_LINK_LIBRARIES ${M_LIBRARY})
set_property(TARGET LIBM PROPERTY INTERFACE_LINK_LIBRARIES ${MATH_LIBRARY})
mark_as_advanced(M_LIBRARY)
message("!!! MATH_LIBRARY: ${MATH_LIBRARY}")
endif()

find_package(PROJ REQUIRED)
Expand Down
19 changes: 10 additions & 9 deletions display/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ install(DIRECTORY ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/barscales
build_program_in_subdir(d.colorlist DEPENDS grass_gis grass_display
grass_raster)
build_program_in_subdir(d.colortable DEPENDS grass_gis grass_display
grass_raster)
grass_raster LIBM)
build_program_in_subdir(d.erase DEPENDS grass_gis grass_display)
if(NOT MSVC)
build_program_in_subdir(d.font DEPENDS grass_gis grass_display grass_raster)
Expand All @@ -81,14 +81,14 @@ if(WITH_DOCS)
DESTINATION ${GRASS_INSTALL_DOCDIR})
endif()
build_program_in_subdir(d.grid DEPENDS grass_gis grass_symb grass_gproj
grass_display)
grass_display 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)
grass_raster LIBM)
build_program_in_subdir(d.info DEPENDS grass_gis grass_display)
build_program_in_subdir(d.labels DEPENDS grass_gis grass_display)
build_program_in_subdir(d.labels DEPENDS grass_gis grass_display LIBM)
build_program_in_subdir(d.legend DEPENDS grass_gis grass_display grass_raster
grass_raster3d)
grass_raster3d LIBM)
build_program_in_subdir(d.legend.vect DEPENDS grass_gis grass_display
grass_symb)
build_program_in_subdir(d.linegraph DEPENDS grass_gis grass_display grass_symb
Expand All @@ -104,15 +104,15 @@ if(WITH_DOCS)
DESTINATION ${GRASS_INSTALL_DOCDIR})
endif()
build_program_in_subdir(d.path DEPENDS grass_gis grass_display grass_vector)
build_program_in_subdir(d.profile DEPENDS grass_gis grass_display grass_raster)
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
grass_display)
grass_display LIBM)
build_program_in_subdir(d.rast.num DEPENDS grass_gis grass_display grass_raster)
build_program_in_subdir(d.redraw DEPENDS grass_gis grass_display)
build_program_in_subdir(d.rgb DEPENDS grass_gis grass_display grass_raster)
build_program_in_subdir(d.rhumbline DEPENDS grass_gis grass_display)
build_program_in_subdir(d.text DEPENDS grass_gis grass_display)
build_program_in_subdir(d.text DEPENDS grass_gis grass_display LIBM)
build_program_in_subdir(d.title DEPENDS grass_gis grass_display grass_raster)
build_program_in_subdir(
d.vect
Expand All @@ -134,7 +134,8 @@ build_program_in_subdir(
grass_display
grass_gis
grass_symb
grass_vector)
grass_vector
LIBM)
build_program_in_subdir(
d.vect.thematic
DEPENDS
Expand Down
3 changes: 2 additions & 1 deletion general/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ build_program_in_subdir(
grass_raster
grass_raster3d
grass_gmath
PROJ)
PROJ
LIBM)

build_program_in_subdir(g.rename DEPENDS grass_gis grass_manage grass_raster)
build_program_in_subdir(g.tempfile DEPENDS grass_gis)
Expand Down
26 changes: 15 additions & 11 deletions imagery/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,21 @@ build_program_in_subdir(
grass_vector
grass_gis
grass_btree2
LIBM
SRC_REGEX
"*.cpp")

build_program_in_subdir(i.biomass DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
grass_vector grass_gis LIBM)
build_program_in_subdir(
i.cca
DEPENDS
grass_imagery
grass_raster
grass_vector
grass_gis
grass_gmath)
grass_gmath
LIBM)
build_program_in_subdir(
i.cluster
DEPENDS
Expand All @@ -87,15 +89,15 @@ build_program_in_subdir(
grass_cluster)

build_program_in_subdir(i.eb.evapfr DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
grass_vector grass_gis LIBM)
build_program_in_subdir(i.eb.eta DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
build_program_in_subdir(i.eb.hsebal01 DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
grass_vector grass_gis LIBM)
build_program_in_subdir(i.eb.netrad DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
build_program_in_subdir(i.eb.soilheatflux DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
grass_vector grass_gis LIBM)

build_program_in_subdir(i.evapo.mh DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
Expand All @@ -106,7 +108,7 @@ build_program_in_subdir(i.evapo.pt DEPENDS grass_imagery grass_raster
build_program_in_subdir(i.evapo.time DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
build_program_in_subdir(i.emissivity DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
grass_vector grass_gis LIBM)
build_program_in_subdir(
i.find
DEPENDS
Expand All @@ -121,7 +123,7 @@ build_program_in_subdir(
NO_DOC)

build_program_in_subdir(i.gensig DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
grass_vector grass_gis LIBM)

build_program_in_subdir(
i.gensigset
Expand All @@ -130,7 +132,8 @@ build_program_in_subdir(
grass_raster
grass_vector
grass_gis
grass_gmath)
grass_gmath
LIBM)

build_program_in_subdir(i.group DEPENDS grass_imagery grass_raster grass_vector
grass_gis)
Expand All @@ -142,7 +145,7 @@ build_program_in_subdir(i.landsat.toar DEPENDS grass_imagery grass_raster
grass_vector grass_gis)

build_program_in_subdir(i.maxlik DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
grass_vector grass_gis LIBM)

build_program_in_subdir(i.modis.qc DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
Expand Down Expand Up @@ -171,7 +174,8 @@ build_program_in_subdir(
grass_raster
grass_vector
grass_gis
grass_gmath)
grass_gmath
LIBM)

build_program_in_subdir(i.target DEPENDS grass_imagery grass_raster
grass_vector grass_gis)
Expand All @@ -189,7 +193,7 @@ build_program_in_subdir(
grass_gmath)

build_program_in_subdir(i.vi DEPENDS grass_imagery grass_raster grass_vector
grass_gis)
grass_gis LIBM)

build_program_in_subdir(
i.zc
Expand Down
2 changes: 1 addition & 1 deletion imagery/i.ortho.photo/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ build_program_in_subdir(i.ortho.target DEPENDS grass_iortho grass_imagery
grass_gis)

build_program_in_subdir(i.ortho.transform DEPENDS grass_iortho grass_imagery
grass_gis grass_gmath)
grass_gis grass_gmath LIBM)
1 change: 1 addition & 0 deletions lib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ build_library_in_subdir(
grass_raster
grass_raster3d
grass_gmath
LIBM
OPTIONAL_DEPENDS
OPENMP)

Expand Down
1 change: 1 addition & 0 deletions lib/rst/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ build_library_in_subdir(
grass_vector
grass_qtree
grass_interpdata
LIBM
OPTIONAL_DEPENDS
OPENMP
HEADERS
Expand Down
3 changes: 2 additions & 1 deletion lib/vector/diglib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ build_module(
grass_gmath
grass_gis
grass_rtree
GDAL)
GDAL
LIBM)
6 changes: 3 additions & 3 deletions misc/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
build_program_in_subdir(m.cogo DEPENDS grass_gis)
build_program_in_subdir(m.cogo DEPENDS grass_gis LIBM)

build_program_in_subdir(m.measure DEPENDS grass_gis)

build_program_in_subdir(m.transform DEPENDS grass_gis grass_imagery
grass_raster grass_vector)
grass_raster grass_vector LIBM)

if(WITH_OPENGL)
build_program_in_subdir(
Expand All @@ -18,5 +18,5 @@ if(WITH_OPENGL)
grass_dbmidriver)

build_program_in_subdir(m.nviz.script DEPENDS grass_display grass_raster
grass_gis)
grass_gis LIBM)
endif(WITH_OPENGL)
3 changes: 2 additions & 1 deletion ps/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ build_program_in_subdir(
grass_dbmibase
grass_dbmiclient
grass_dbmidriver
grass_symb)
grass_symb
LIBM)

add_custom_command(
TARGET ps.map
Expand Down
Loading

0 comments on commit 7b117ff

Please sign in to comment.