diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-28 11:57:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-28 11:57:17 -0600 |
| commit | 1f91fd9f6d689a2fdd2643f7e8a8fc49913c8185 (patch) | |
| tree | 9b23f6d2b409c965f0d31b399732e6c73efd1749 | |
| parent | d31e4444476ce2f2ad45697f69662de1ac288c55 (diff) | |
| download | tdesvn-1f91fd9f6d689a2fdd2643f7e8a8fc49913c8185.tar.gz tdesvn-1f91fd9f6d689a2fdd2643f7e8a8fc49913c8185.zip | |
Fix apr detection
| -rw-r--r-- | ConfigureChecks.cmake | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 3935f7d..287113c 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -118,14 +118,20 @@ IF (UNIX) MESSAGE(SEND_ERROR "Error: no apu-config found") endif(NOT APU_CONFIG) - EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR) - EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR) - - EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS) - EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS) - - EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS) - EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS) + EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR_INT) + EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR_INT) + SET(APR_INCLUDE_DIR "${APR_INCLUDE_DIR_INT}" CACHE INTERNAL "") + SET(APU_INCLUDE_DIR "${APU_INCLUDE_DIR_INT}" CACHE INTERNAL "") + + EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS_INT) + EXEC_PROGRAM(${APU_CONFIG} ARGS "--includes" OUTPUT_VARIABLE APU_CPP_FLAGS_INT) + SET(APR_CPP_FLAGS "${APR_CPP_FLAGS_INT}" CACHE INTERNAL "") + SET(APU_CPP_FLAGS "${APU_CPP_FLAGS_INT}" CACHE INTERNAL "") + + EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS_INT) + EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS_INT) + SET(APR_EXTRA_LIBFLAGS "${APR_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "") + SET(APU_EXTRA_LIBFLAGS "${APU_EXTRA_LIBFLAGS_INT}" CACHE INTERNAL "") CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H) |