Ensure it uses our FindIconv.cmake module Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt @@ -431,9 +431,9 @@ find_package(Freetype) if(NOT FREETYPE_FOUND) report_mandatory_not_found(FREETYPE) endif(NOT FREETYPE_FOUND) -include_directories(${FREETYPE_INCLUDE_DIR}) +include_directories(${FREETYPE_INCLUDE_DIRS}) ms_link_libraries( ${FREETYPE_LIBRARY}) -list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR}) +list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) find_package(Proj) @@ -503,7 +503,7 @@ endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) ) if(WITH_ICONV) - find_package(ICONV) + find_package(Iconv) if(ICONV_FOUND) include_directories(${ICONV_INCLUDE_DIR}) ms_link_libraries( ${ICONV_LIBRARY}) @@ -1074,7 +1074,7 @@ if(UNIX) else() set(DEFAULT_DATA_SUBDIR share/mapserver) endif() -set(DEFAULT_CONFIG_FILE ${CMAKE_INSTALL_FULL_SYSCONFDIR}/mapserver.conf) +set(DEFAULT_CONFIG_FILE /${CMAKE_INSTALL_SYSCONFDIR}/mapserver.conf) # Locations are changeable by user to customize layout of MapServer installation # (default values are platform-specific) @@ -1107,5 +1107,5 @@ install( install( FILES ${PROJECT_SOURCE_DIR}/etc/mapserver-sample.conf - DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/ + DESTINATION ${MAPSERVER_DATA_SUBDIR}/ )