diff options
| author | Mladen Turk <mturk@apache.org> | 2021-12-02 20:25:42 +0000 |
|---|---|---|
| committer | Mladen Turk <mturk@apache.org> | 2021-12-02 20:25:42 +0000 |
| commit | e1835672125cc905c7d21a1f48f6bd3e3a2c6921 (patch) | |
| tree | 760a3d377f589848ac01b8bcd583992e7f1fc229 /CMakeLists.txt | |
| parent | c27e43c318b52eb3d869e73d5d079ac38c8a29d7 (diff) | |
| download | apr-e1835672125cc905c7d21a1f48f6bd3e3a2c6921.tar.gz | |
Add missing config directories returned by findIconv module
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895503 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b87290eb..7fb408d7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,6 +142,13 @@ ELSEIF(APU_USE_XMLLITE) SET(XMLLIB_LIBRARIES "xmllite.lib") ENDIF() +IF(APU_HAVE_ICONV) + SET(XLATE_INCLUDE_DIR ${Iconv_INCLUDE_DIRS}) + SET(XLATE_LIBRARIES ${Iconv_LIBRARIES}) +ELSE() + SET(XLATE_INCLUDE_DIR "") + SET(XLATE_LIBRARIES "") +ENDIF() # Generated .h files are stored in PROJECT_BINARY_DIR, not the # source tree. # @@ -163,7 +170,7 @@ SET(APR_SYSTEM_LIBS bcrypt ) -INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${APR_INCLUDE_DIRECTORIES} ${XMLLIB_INCLUDE_DIR} ${XLATE_INCLUDE_DIR}) SET(APR_PUBLIC_HEADERS_STATIC include/apr_allocator.h @@ -457,14 +464,14 @@ SET(dbd_drivers) ADD_LIBRARY(${apr_libname} SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) SET(install_targets ${install_targets} ${apr_libname}) SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/${apr_libname}.pdb) -TARGET_LINK_LIBRARIES(${apr_libname} ${XMLLIB_LIBRARIES} ${APR_SYSTEM_LIBS}) +TARGET_LINK_LIBRARIES(${apr_libname} ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS}) SET_TARGET_PROPERTIES(${apr_libname} PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;APR_HAVE_MODULAR_DSO") ADD_DEPENDENCIES(${apr_libname} test_char_header) ADD_LIBRARY(${apr_name} STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) SET(install_targets ${install_targets} ${apr_name}) # no .pdb file generated for static libraries -TARGET_LINK_LIBRARIES(${apr_name} ${XMLLIB_LIBRARIES} ${APR_SYSTEM_LIBS}) +TARGET_LINK_LIBRARIES(${apr_name} ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS}) SET_TARGET_PROPERTIES(${apr_name} PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_HAVE_MODULAR_DSO") ADD_DEPENDENCIES(${apr_name} test_char_header) @@ -532,7 +539,7 @@ IF(APR_BUILD_TESTAPR) ENDIF() ADD_EXECUTABLE(testapp test/testapp.c) - TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp} ${XMLLIB_LIBRARIES} ${APR_SYSTEM_LIBS}) + TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp} ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS}) SET_TARGET_PROPERTIES(testapp PROPERTIES LINK_FLAGS /entry:wmainCRTStartup) IF(apiflag) SET_TARGET_PROPERTIES(testapp PROPERTIES COMPILE_FLAGS ${apiflag}) @@ -540,7 +547,7 @@ IF(APR_BUILD_TESTAPR) ADD_TEST(NAME testapp COMMAND testapp) ADD_EXECUTABLE(testall ${APR_TEST_SOURCES}) - TARGET_LINK_LIBRARIES(testall ${whichapr} ${XMLLIB_LIBRARIES} ${APR_SYSTEM_LIBS}) + TARGET_LINK_LIBRARIES(testall ${whichapr} ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS}) IF(apiflag) SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag}) ENDIF() @@ -582,7 +589,7 @@ IF(APR_BUILD_TESTAPR) FOREACH(sourcefile ${single_source_programs}) STRING(REGEX REPLACE ".*/([^\\]+)\\.c" "\\1" proggie ${sourcefile}) ADD_EXECUTABLE(${proggie} ${sourcefile}) - TARGET_LINK_LIBRARIES(${proggie} ${whichapr} ${XMLLIB_LIBRARIES} ${APR_SYSTEM_LIBS}) + TARGET_LINK_LIBRARIES(${proggie} ${whichapr} ${XMLLIB_LIBRARIES} ${XLATE_LIBRARIES} ${APR_SYSTEM_LIBS}) IF(apiflag) SET_TARGET_PROPERTIES(${proggie} PROPERTIES COMPILE_FLAGS ${apiflag}) ENDIF() |