Fix python include path

Some of the ANTLR and Python include files are conflicting, so this
change adjusts the python include path to be private. ANTLR exposed the
issue, but I believe this is more generally a positive thing,
independent of the particular ANTLR/Python collision.

Author: kbenne

ProjectMacros.cmake

@@ -357,6 +357,11 @@ macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_S
       ${SWIG_WRAPPER}
     )
 
+    target_include_directories(${swig_target}
+      SYSTEM PRIVATE
+      ${Python_INCLUDE_DIRS}
+    )
+
     target_compile_definitions(${swig_target} PRIVATE SHARED_OS_LIBS)
     target_compile_definitions(${swig_target} PRIVATE SWIG_PYTHON_SILENT_MEMLEAK) # Shush it, cf #5421
     set_target_properties(${swig_target} PROPERTIES OUTPUT_NAME _${LOWER_NAME})
@@ -454,6 +459,11 @@ macro(MAKE_SWIG_TARGET NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PARENT_S
         ${SWIG_WRAPPER}
       )
 
+      target_include_directories(${swig_target}
+        SYSTEM PRIVATE
+        ${Python_INCLUDE_DIRS}
+      )
+
       set_target_properties(${swig_target} PROPERTIES OUTPUT_NAME _${LOWER_NAME})
       set_target_properties(${swig_target} PROPERTIES PREFIX "")
       set_target_properties(${swig_target} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${PYTHON_PACKAGE_FOLDER}/openstudio/")

python/SetupPython.cmake

@@ -85,7 +85,6 @@ else()
   # endif()
 endif()
 
-include_directories(SYSTEM ${Python_INCLUDE_DIRS})
 set(ALL_PYTHON_BINDING_TARGETS "") # global list of python bindings
 set(ALL_PYTHON_BINDING_DEPENDS "") # global list of library dependencies of the generated wrapper cxx files
 set(ALL_PYTHON_WRAPPER_FILES "") # global list of generated wrapper cxx files