Sync to PR Cmake build2 #348 (replaces #348)

OSGeo · Dec 5, 2022 · a1c304b · a1c304b
1 parent 98cb9a0
commit a1c304b
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 18 deletions.
diff --git a/cmake/ctypesgen.cmake b/cmake/ctypesgen.cmake
@@ -16,7 +16,7 @@ set(ENV{LC_ALL} C)
 set(LIBRARIES)
 foreach(LIB ${LIBS})
   if(WIN32)
-    list(APPEND LIBRARIES "--library=${BIN_DIR}/bin/${LIB}.dll")
+    list(APPEND LIBRARIES "--library=${BIN_DIR}/lib/${LIB}.dll")
   elseif(APPLE)
     list(APPEND LIBRARIES "--library=${BIN_DIR}/lib/lib${LIB}.so")
   else()

diff --git a/cmake/modules/build_library_in_subdir.cmake b/cmake/modules/build_library_in_subdir.cmake
@@ -13,4 +13,4 @@ macro(build_library_in_subdir dir_name)
     #message("dir_name=${dir_name} |g_name= ${g_name}")
     build_module(NAME grass_${g_name} SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}/${dir_name} ${ARGN})
   endif()
-endmacro()
+endmacro()
diff --git a/cmake/modules/build_program.cmake b/cmake/modules/build_program.cmake
@@ -5,4 +5,4 @@
 #   	    	 Read the file COPYING that comes with GRASS for details.
 macro(build_program)
   build_module(${ARGN} EXE)
-endmacro()
+endmacro()
diff --git a/cmake/modules/get_versions.cmake b/cmake/modules/get_versions.cmake
@@ -31,4 +31,4 @@ set(${var_major} ${version_major} PARENT_SCOPE)
 set(${var_minor} ${version_minor} PARENT_SCOPE)
 set(${var_release} ${version_release} PARENT_SCOPE)
 set(${var_date} ${version_date} PARENT_SCOPE)
-endfunction()
+endfunction()
diff --git a/cmake/modules/repo_status.cmake b/cmake/modules/repo_status.cmake
@@ -33,4 +33,4 @@ execute_process(
 
   set(${version_git_var} "${GRASS_VERSION_GIT}" PARENT_SCOPE)
 
-endfunction() #repo_status
+endfunction() #repo_status
diff --git a/cmake/modules/set_compiler_flags.cmake b/cmake/modules/set_compiler_flags.cmake
@@ -10,4 +10,4 @@ endif()
 set(CMAKE_CXX_FLAGS "${GRASS_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
 set(CMAKE_C_FLAGS "${GRASS_C_FLAGS} ${CMAKE_C_FLAGS}")
 
-endmacro()
+endmacro()
diff --git a/gui/icons/CMakeLists.txt b/gui/icons/CMakeLists.txt
@@ -20,12 +20,15 @@ endforeach()
 foreach(ICON ${GRASS_ICONS})
   get_filename_component(FILE_NAME ${ICON} NAME)
   add_custom_command(OUTPUT ${GISBASE}/gui/icons/grass/${FILE_NAME}
- 	COMMAND ${CMAKE_COMMAND} -E copy ${ICON} ${GISBASE}/gui/icons/grass/
-    COMMAND ${CMAKE_COMMAND} -E copy ${ICON} ${GISBASE}/docs/html/icons/)
+ 	COMMAND ${CMAKE_COMMAND} -E copy ${ICON} ${GISBASE}/gui/icons/grass/)
   list(APPEND output_icons ${GISBASE}/gui/icons/grass/${FILE_NAME})
+
+  add_custom_command(OUTPUT ${GISBASE}/docs/html/icons/${FILE_NAME}
+    COMMAND ${CMAKE_COMMAND} -E copy ${ICON} ${GISBASE}/docs/html/icons/)
   list(APPEND output_icons ${GISBASE}/docs/html/icons/${FILE_NAME})
 endforeach()
 
+
 foreach(ICON ${FLAGS_ICONS})
   get_filename_component(FILE_NAME ${ICON} NAME)
   add_custom_command(OUTPUT ${GISBASE}/gui/icons/flags/${FILE_NAME}

diff --git a/gui/images/CMakeLists.txt b/gui/images/CMakeLists.txt
@@ -18,9 +18,9 @@ add_custom_target(gui_images
   DEPENDS gui_icons ${output_images})
 
 install(FILES ${GUI_IMAGES} DESTINATION gui/images/)
-install(DIRECTORY basic DESTINATION gui/images/symbols/)
-install(DIRECTORY demo DESTINATION gui/images/symbols/)
-install(DIRECTORY extra DESTINATION gui/images/symbols/)
-install(DIRECTORY geology DESTINATION gui/images/symbols/)
-install(DIRECTORY legend DESTINATION gui/images/symbols/)
-install(DIRECTORY n_arrows DESTINATION gui/images/symbols/)
+install(DIRECTORY symbols/basic DESTINATION gui/images/symbols/)
+install(DIRECTORY symbols/demo DESTINATION gui/images/symbols/)
+install(DIRECTORY symbols/extra DESTINATION gui/images/symbols/)
+install(DIRECTORY symbols/geology DESTINATION gui/images/symbols/)
+install(DIRECTORY symbols/legend DESTINATION gui/images/symbols/)
+install(DIRECTORY symbols/n_arrows DESTINATION gui/images/symbols/)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -141,10 +141,10 @@ build_library_in_subdir(arraystats DEPENDS grass_gis)
 
 if(WITH_OPENGL)
 	build_library_in_subdir(ogsf
-	DEPENDS grass_raster grass_raster3d OPENGL TIFF)
+	DEPENDS grass_raster grass_raster3d grass_vector grass_bitmap OPENGL TIFF)
 
 	build_library_in_subdir(nviz
-	DEPENDS grass_display grass_raster grass_vector grass_bitmap OPENGL TIFF)
+	DEPENDS grass_display grass_raster grass_vector grass_bitmap grass_ogsf OPENGL TIFF)
 endif()
 
 add_subdirectory(temporal)

diff --git a/lib/init/license.txt.in b/lib/init/license.txt.in
@@ -1,7 +1,7 @@
 Geographic Resources Analysis Support System (GRASS) is Copyright,
 1999-@GRASS_VERSION_DATE@ by the GRASS Development Team, and licensed under terms of the
 GNU General Public License (GPL) version >=2.
- 
+
 This GRASS GIS @GRASS_VERSION_NUMBER@ release is coordinated and produced by
 the GRASS Development Team with contributions from all over the world.
 

diff --git a/python/libgrass_interface_generator/CMakeLists.txt b/python/libgrass_interface_generator/CMakeLists.txt
@@ -74,6 +74,7 @@ foreach(module ${MODULES})
 	-DHDRS=${${module}_HDRS}
 	-DLIBS=${${module}_LIBS}
 	-DOUT_FILE=${output_file}
+	-DGRASS_VERSION_NUMBER=${GRASS_VERSION_NUMBER}
 	-P ${CMAKE_SOURCE_DIR}/cmake/ctypesgen.cmake
 	COMMENT "Generating ${output_file}"
 	VERBATIM)

diff --git a/vector/CMakeLists.txt b/vector/CMakeLists.txt
@@ -209,4 +209,4 @@ build_program_in_subdir(v.out.postgis DEPENDS grass_gis grass_vector PRIMARY_DEP
 
 if(WITH_OPENDWG)
 	build_program_in_subdir(v.in.dwg DEPENDS grass_gis grass_vector)
-endif()
+endif()