Prefect CMake support.

	修改：     CMakeLists.txt
	修改：     ChangeLog
	修改：     lib/iconv.cpp
	修改：     tests/tests.cmake

Author: ChenPi11

CMakeLists.txt

@@ -1,35 +1,48 @@
 cmake_minimum_required(VERSION 3.12)
 project(cppp-reiconv VERSION 2.0.0)
 
+# Define options
+option(ENABLE_EXTRA "Enable extra encodings and features." OFF)
+
+# Set C++ standard
 set(CMAKE_CXX_STANDARD 11)
 
 include("${CMAKE_SOURCE_DIR}/build-aux/cmake/cppp.cmake")
 
 check_have_visibility()
 
-set(DLL_VARIABLE "__attribute__((__visibility__(\"default\")))")
-
+# Generate header file for build
+if(WIN32)
+    set(DLL_VARIABLE "__declspec(dllexport)")
+elseif(HAVE_VISIBILITY)
+    set(DLL_VARIABLE "__attribute__((__visibility__(\"default\")))")
+else()
+    set(DLL_VARIABLE "")
+endif()
 configure_file("${srcdir}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp")
 
-# Clear DLL_VARIABLE
-set(DLL_VARIABLE "")
+# Generate header file for install
+if(WIN32)
+    set(DLL_VARIABLE "__declspec(dllimport)")
+elseif(HAVE_VISIBILITY)
+    set(DLL_VARIABLE "__attribute__((__visibility__(\"default\")))")
+else()
+    set(DLL_VARIABLE "")
+endif()
 configure_file("${srcdir}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp.inst")
 
+# Add includes
 include_directories("${srcdir}/lib")
 include_directories("${srcdir}/lib/generated")
 include_directories("${output_includedir}")
 
 # Add definitions
-add_compile_definitions(ENABLE_EXTRA=1)
+if(ENABLE_EXTRA)
+    add_compile_definitions(ENABLE_EXTRA=1)
+endif()
 
 # Add library
-add_library(libcppp-reiconv.shared SHARED "${srcdir}/lib/iconv.cpp")
-
-# Set properties
-set_target_properties(libcppp-reiconv.shared PROPERTIES
-                        OUTPUT_NAME ${PROJECT_NAME}
-                        LIBRARY_OUTPUT_DIRECTORY "${output_shareddir}"
-                        ARCHIVE_OUTPUT_DIRECTORY "${output_staticddir}"
-                        VERSION ${PROJECT_VERSION} )
+cppp_build_library(${PROJECT_NAME} "${srcdir}/lib/iconv.cpp" TRUE TRUE)
 
+# Include test suite.
 include("tests/tests.cmake")

ChangeLog

@@ -10,6 +10,7 @@
 	Remove autoconf buildsystem support.
 	Add CMake support.
 	Move generated file into 'lib/generated'.
+	Move cppp-reiconv to a C++ library.
 
 2023-06-29  Bruno Haible  <bruno@clisp.org>
 

lib/iconv.cpp

@@ -20,17 +20,14 @@
 #include <cppp/reiconv.hpp>
 
 #include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __CYGWIN__
-#include <cygwin/version.h>
-#endif
+#include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 namespace cppp{namespace base{namespace reiconv
 {
 
-  #ifdef ENABLE_EXTRA
+  #if ENABLE_EXTRA
   /*
   * Consider all system dependent encodings, for any system,
   * and the extra encodings.
@@ -592,20 +589,6 @@ namespace cppp{namespace base{namespace reiconv
   /* version number: (major<<8) + minor */
   int reiconv_version = (3 << 8) + 0;
 
-  #if defined __FreeBSD__ && !defined __gnu_freebsd__
-  /* GNU libiconv is the native FreeBSD iconv implementation since 2002.
-    It wants to define the symbols 'iconv_open', 'iconv', 'iconv_close'.  */
-  #define strong_alias(name, aliasname) _strong_alias(name, aliasname)
-  #define _strong_alias(name, aliasname) \
-    extern __typeof (name) aliasname __attribute__ ((alias (#name)));
-  #undef iconv_open
-  #undef iconv
-  #undef iconv_close
-  strong_alias (libiconv_open, iconv_open)
-  strong_alias (libiconv, iconv)
-  strong_alias (libiconv_close, iconv_close)
-  #endif
-
   #endif
 
   #define tmpbufsize 4096
@@ -620,6 +603,8 @@ namespace cppp{namespace base{namespace reiconv
     if (cd == (iconv_t)(-1)) {
       if (errno != EINVAL)
         return -1;
+/* Autodetect feature is a extra feature. */
+#if ENABLE_EXTRA
       /* Unsupported fromcode or tocode. Check whether the caller requested
         autodetection. */
       if (!strcmp(fromcode,"autodetect_utf8")) {
@@ -662,6 +647,7 @@ namespace cppp{namespace base{namespace reiconv
         ret = iconv_string(tocode,"EUC-KR",start,end,resultp,lengthp);
         return ret;
       }
+#endif
       errno = EINVAL;
       return -1;
     }

tests/tests.cmake

@@ -176,6 +176,7 @@ if (ENABLE_TEST)
               WORKING_DIRECTORY "${output_testsdir}"
               COMMAND "${output_testsdir}/test-shiftseq" )
 
+    if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
     # AIX specific encodings
     test("stateless" "CP856")
     test("stateless" "CP922")
@@ -185,6 +186,7 @@ if (ENABLE_TEST)
     test("stateless" "CP1161")
     test("stateless" "CP1162")
     test("stateless" "CP1163")
+    endif()
 
     # OSF/1 specific encodings
     test("stateless" "DEC-KANJI")