fix ctypesgen

Co-authored-by: Rashad Kanavath <[email protected]>

Author: echoix

cmake/ctypesgen.cmake

@@ -4,9 +4,7 @@
 #   	    	 This program is free software under the GPL (>=v2)
 #   	    	 Read the file COPYING that comes with GRASS for details.
 
-set(ENV{GISRC}
-    "${BIN_DIR}/demolocation/.grassrc${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}"
-)
+set(ENV{GISRC} "${BIN_DIR}/etc/config/rc")
 set(ENV{GISBASE} "${BIN_DIR}")
 set(ENV{PATH} "${BIN_DIR}/bin:${BIN_DIR}/scripts:$ENV{PATH}")
 set(ENV{PYTHONPATH}
@@ -19,12 +17,15 @@ 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}.${GRASS_VERSION_NUMBER}.dll")
   elseif(APPLE)
-    list(APPEND LIBRARIES "--library=${BIN_DIR}/lib/lib${LIB}.so")
+    list(APPEND LIBRARIES
+         "--library=${BIN_DIR}/lib/lib${LIB}.${GRASS_VERSION_NUMBER}.so")
   else()
     #This can be linux or unix
-    list(APPEND LIBRARIES "--library=${BIN_DIR}/lib/lib${LIB}.so")
+    list(APPEND LIBRARIES
+         "--library=${BIN_DIR}/lib/lib${LIB}.${GRASS_VERSION_NUMBER}.so")
   endif()
 endforeach()
 

python/grass/CMakeLists.txt

@@ -49,8 +49,7 @@ add_custom_target(
           python_pygrass_modules_interface
           python_pygrass_modules_grid)
 
-#TODO: MODULES DISABLED
-#  add_subdirectory(ctypes)
+add_subdirectory(ctypes)
 
 set_target_properties(LIB_PYTHON PROPERTIES FOLDER lib)
 

python/libgrass_interface_generator/CMakeLists.txt

@@ -88,7 +88,8 @@ foreach(module ${MODULES})
       ${CMAKE_COMMAND} -DCTYPESGEN_PY=${CMAKE_CURRENT_SOURCE_DIR}/ctypesgen.py
       -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} -DCOMPILER=${CMAKE_C_COMPILER}
       -DBIN_DIR=${GISBASE} -DHDRS=${${module}_HDRS} -DLIBS=${${module}_LIBS}
-      -DOUT_FILE=${output_file} -P ${CMAKE_SOURCE_DIR}/cmake/ctypesgen.cmake
+      -DOUT_FILE=${output_file} -DGRASS_VERSION_NUMBER=${GRASS_VERSION_NUMBER}
+      -P ${CMAKE_SOURCE_DIR}/cmake/ctypesgen.cmake
     COMMENT "Generating ${output_file}"
     VERBATIM)