]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
CMake: use CMAKE_REQUIRED_INCLUDES to find APR macros
authorJacob Champion <jchampion@apache.org>
Tue, 12 Jul 2016 19:13:34 +0000 (19:13 +0000)
committerJacob Champion <jchampion@apache.org>
Tue, 12 Jul 2016 19:13:34 +0000 (19:13 +0000)
When using CMake with Visual Studio on Windows, invoking the
CHECK_SYMBOL_EXISTS macro with the full paths to the include files seems
to always result in failure.

Instead, use the documented CMAKE_REQUIRED_INCLUDES variable to set the
include directory, and pass only the headers' base names to
CHECK_SYMBOL_EXISTS.

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

CMakeLists.txt

index a0fd892da5e794fc50447f35b78a75ee0c73e979..9928fa0f2af92ea533e450a9c4eb8f98a562949c 100644 (file)
@@ -125,7 +125,8 @@ GET_MOD_ENABLE_RANK("ENABLE_MODULES setting" ${ENABLE_MODULES} enable_modules_ra
 # not defined to either 1 or 0)
 
 MACRO(CHECK_APR_FEATURE which_define)
-  CHECK_SYMBOL_EXISTS(${which_define} "${APR_INCLUDE_DIR}/apr.h;${APR_INCLUDE_DIR}/apu.h" tmp_${which_define})
+  SET(CMAKE_REQUIRED_INCLUDES "${APR_INCLUDE_DIR}")
+  CHECK_SYMBOL_EXISTS(${which_define} "apr.h;apu.h" tmp_${which_define})
   IF(${tmp_${which_define}})
     CHECK_C_SOURCE_COMPILES("#include \"${APR_INCLUDE_DIR}/apr.h\"
       #include \"${APR_INCLUDE_DIR}/apu.h\"