Fix SWIG mapscript failure with out of source builds (MapServer#7090)

szekerest · Jun 25, 2024 · 2d0ef1a · 2d0ef1a
1 parent a8f6aca
commit 2d0ef1a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/src/mapscript/csharp/CMakeLists.txt b/src/mapscript/csharp/CMakeLists.txt
@@ -34,6 +34,7 @@ MARK_AS_ADVANCED(CSHARP_COMPILER)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/swiginc)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/csharp)
+include_directories(${PROJECT_BINARY_DIR}/src/mapscript/)
 SET (CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}")
 if (WIN32)
 	SET( CMAKE_SWIG_FLAGS -namespace OSGeo.MapServer -DWIN32 ${MAPSERVER_COMPILE_DEFINITIONS})

diff --git a/src/mapscript/java/CMakeLists.txt b/src/mapscript/java/CMakeLists.txt
@@ -11,6 +11,7 @@ include_directories(${JNI_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/swiginc)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/java)
+include_directories(${PROJECT_BINARY_DIR}/src/mapscript/)
 set (CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/edu/umn/gis/mapscript")
 set(CMAKE_SWIG_FLAGS -package edu.umn.gis.mapscript)
 

diff --git a/src/mapscript/perl/CMakeLists.txt b/src/mapscript/perl/CMakeLists.txt
@@ -9,6 +9,7 @@ include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/)
 add_definitions(${PERL_EXTRA_C_FLAGS})
 set(CMAKE_SWIG_FLAGS -shadow -w314)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/perl)
+include_directories(${PROJECT_BINARY_DIR}/src/mapscript/)
 
 if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.7)
     swig_add_library(perlmapscript TYPE MODULE LANGUAGE perl5 SOURCES ../mapscript.i)

diff --git a/src/mapscript/python/CMakeLists.txt b/src/mapscript/python/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories(${Python_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/swiginc)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/python)
+include_directories(${PROJECT_BINARY_DIR}/src/mapscript/)
 
 set(SwigFile ${PROJECT_SOURCE_DIR}/src/mapscript/mapscript.i)
 

diff --git a/src/mapscript/ruby/CMakeLists.txt b/src/mapscript/ruby/CMakeLists.txt
@@ -5,6 +5,7 @@ include_directories(${RUBY_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/swiginc)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/)
 include_directories(${PROJECT_SOURCE_DIR}/src/mapscript/ruby)
+include_directories(${PROJECT_BINARY_DIR}/src/mapscript/)
 
 if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.7)
     swig_add_library(rubymapscript TYPE MODULE LANGUAGE ruby SOURCES ../mapscript.i)