You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/10/05 15:49:22 UTC

svn commit: r1529452 - /httpd/httpd/trunk/CMakeLists.txt

Author: trawick
Date: Sat Oct  5 13:49:22 2013
New Revision: 1529452

URL: http://svn.apache.org/r1529452
Log:
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.

Modified:
    httpd/httpd/trunk/CMakeLists.txt

Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1529452&r1=1529451&r2=1529452&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Sat Oct  5 13:49:22 2013
@@ -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()