Skip to content

Commit 8cb31ee

Browse files
dudakaHuidaeCho
andauthored
ctypesgen: Fix ctypesgen build issues on Windows (OSGeo#6307)
* Fix ctypesgen build issues on Windows * Remove debug comments; Remove header path conversion --------- Co-authored-by: Huidae Cho <[email protected]>
1 parent 9a3d800 commit 8cb31ee

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

cmake/ctypesgen.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(NOT MSVC)
3131
endif()
3232
set(ENV{LC_ALL} C)
3333

34-
set(CTYPESFLAGS "\"${COMPILER}\" -E ${C_FLAGS}")
34+
set(CTYPESFLAGS "${COMPILER} -E ${C_FLAGS}")
3535

3636
set(LIBRARIES)
3737
foreach(LIB ${LIBS})
@@ -40,7 +40,7 @@ endforeach()
4040

4141
set(INC_HEADERS)
4242
foreach(INCHDR ${INCHDRS})
43-
list(APPEND INC_HEADERS "-I\"${INCHDR}\"")
43+
list(APPEND INC_HEADERS "-I${INCHDR}")
4444
endforeach()
4545

4646
set(DEFINES)
@@ -61,7 +61,7 @@ endforeach()
6161
message(STATUS "Generating ${OUT_FILE}")
6262
execute_process(
6363
COMMAND
64-
${PYTHON_EXECUTABLE} ${CTYPESGEN_PY} --cpp "${CTYPESFLAGS}"
64+
${PYTHON_EXECUTABLE} ${CTYPESGEN_PY} --cpp ${CTYPESFLAGS}
6565
--no-embed-preamble --strip-build-path ${RUNTIME_GISBASE} ${INC_HEADERS}
6666
${LIBRARIES} ${DEFINES} -o ${OUT_FILE} ${HEADERS}
6767
OUTPUT_VARIABLE ctypesgen_OV

python/libgrass_interface_generator/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ foreach(module ${MODULES})
7474
endif()
7575

7676
if(NOT ${module}_INCHDRS)
77-
set(${module}_INCHDRS})
77+
set(${module}_INCHDRS)
7878
endif()
7979
list(INSERT ${module}_INCHDRS 0 ${OUTDIR}/${GRASS_INSTALL_INCLUDEDIR})
8080
if(CMAKE_INSTALL_INCLUDEDIR)
@@ -109,6 +109,7 @@ foreach(module ${MODULES})
109109
-DGRASS_INSTALL_DEMODIR=${GRASS_INSTALL_DEMODIR}
110110
-DGRASS_INSTALL_LIBDIR=${GRASS_INSTALL_LIBDIR}
111111
-DRUNTIME_GISBASE=${RUNTIME_GISBASE} -DOUT_FILE=${output_file}
112+
-DMSVC=${MSVC} -DAPPLE=${APPLE}
112113
-DGRASS_VERSION_NUMBER=${GRASS_VERSION_NUMBER}
113114
-DGRASS_VERSION_MAJOR=${GRASS_VERSION_MAJOR}
114115
-DGRASS_VERSION_MINOR=${GRASS_VERSION_MINOR} -P

0 commit comments

Comments
 (0)