From: Jeff Trawick <trawick@apache.org>
Date: Sat, 5 Oct 2013 13:49:22 +0000 (+0000)
Subject: When building modules with prereqs, search httpd include dirs
X-Git-Tag: 2.5.0-alpha~4972
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc8495dba1dbb708579e6cfb9be3a7e0a32817f0;p=apache

When building modules with prereqs, search httpd include dirs
before prereq include dirs in case httpd is installed to the same
place as the prereq, in which case we might be using an older
httpd .h file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529452 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b700d51ac..e067b9ba02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -730,7 +730,7 @@ FOREACH (mod ${MODULE_PATHS})
     # Extra includes?
     SET(mod_extra_includes "${mod_name}_extra_includes")
     IF(NOT "${${mod_extra_includes}}" STREQUAL "")
-      SET(tmp_includes ${${mod_extra_includes}} ${HTTPD_INCLUDE_DIRECTORIES})
+      SET(tmp_includes ${HTTPD_INCLUDE_DIRECTORIES} ${${mod_extra_includes}})
       SET_TARGET_PROPERTIES(${mod_name} PROPERTIES INCLUDE_DIRECTORIES "${tmp_includes}")
       GET_PROPERTY(tmp_includes TARGET ${mod_name} PROPERTY INCLUDE_DIRECTORIES)
     ENDIF()