fix all

all right

Author: sunxfancy

.travis.yml

@@ -6,7 +6,7 @@ language: python
 env:
   global:
     - CONAN_UPLOAD=1
-    - CONAN_REFERENCE="estring/1.2"
+    - CONAN_REFERENCE="estring/1.2.1"
     - CONAN_USERNAME="sunxfancy"
     - CONAN_CHANNEL="testing"
     - CONAN_TOTAL_PAGES=1

CMakeLists.txt

@@ -38,4 +38,4 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${VERSION_MAJOR}.${VERS
 endif()
 
 add_subdirectory(doc)
-add_subdirectory(test)
+# add_subdirectory(test)

appveyor.yml

@@ -5,7 +5,7 @@ environment:
     PYTHON_ARCH: "32"
 
     CONAN_UPLOAD: 1
-    CONAN_REFERENCE: "estring/1.2"
+    CONAN_REFERENCE: "estring/1.2.1"
     CONAN_USERNAME: "sunxfancy"
     CONAN_CHANNEL: "testing"
     CONAN_TOTAL_PAGES: 4

conanfile.py

@@ -4,12 +4,12 @@
 
 class EstringConan(ConanFile):
     name = "estring"
-    version = "1.2"
+    version = "1.2.1"
     license = "MIT"
     url = "https://github.com/sunxfancy/estring"
     settings = "os", "compiler", "build_type", "arch"
     options = {"shared": [True, False]}
-    requires = "libiconv/1.14@lasote/stable", "libcharsetdetect/1.0@sunxfancy/stable", "gtest/1.8.0@lasote/stable"
+    requires = "libiconv/1.14@sunxfancy/stable", "libcharsetdetect/1.0@sunxfancy/stable", "gtest/1.8.0@lasote/stable"
     default_options = "shared=False", "gtest:shared=False"
     generators = "cmake"
     build_policy = "missing"
@@ -23,12 +23,14 @@ def build(self):
 
     def imports(self):
         self.copy(pattern="*.dll", dst="bin", src="bin")
+        self.copy(pattern="*.so*", dst="bin", src="lib")
         self.copy(pattern="*.dylib", dst="bin", src="lib")
 
     def package(self):
         self.copy("*.h", dst="include", src="include")
         self.copy("*.a", dst="lib", src="lib", keep_path=False)
         self.copy("*.lib", dst="lib", src="lib", keep_path=False)
+        self.copy("*.dll", dst="bin", src="bin", keep_path=False)
         self.copy("*.dll", dst="bin", src="lib", keep_path=False)
         self.copy("*.so*", dst="lib", src="lib", keep_path=False)
         self.copy("*.dylib", dst="lib", src="lib", keep_path=False)

src/estring.cpp

@@ -7,6 +7,7 @@
 
 #include "estring.h"
 extern "C" {
+#define ICONV_CONST 
 #include "iconv.h"
 #include "charsetdetect.h"
 }

test/CMakeLists.txt

@@ -4,7 +4,6 @@ find_package(GTest REQUIRED)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 include_directories (${GTEST_INCLUDE_DIRS})
 file(GLOB_RECURSE test_source_files ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-
 add_executable (all_test ${test_source_files})
 
 target_link_libraries(all_test

test_package/conanfile.py

@@ -7,7 +7,7 @@
 
 class HelloReuseConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    requires = "estring/1.2@%s/%s" % (username, channel)
+    requires = "estring/1.2.1@%s/%s" % (username, channel)
     generators = "cmake"
     build_policy = "missing"
 
@@ -20,3 +20,8 @@ def build(self):
     def test(self):
         # equal to ./bin/greet, but portable win: .\bin\greet
         self.run(os.sep.join([".","bin", "libtest"]))
+
+    def imports(self):
+        self.copy(pattern="*.dll", dst="bin", src="bin")
+        self.copy(pattern="*.so*", dst="bin", src="lib")
+        self.copy(pattern="*.dylib", dst="bin", src="lib")