mirror of
				https://github.com/msgpack/msgpack-c.git
				synced 2025-11-03 19:40:38 +01:00 
			
		
		
		
	Fixed #395
libmsgpack.[a|so] is the library file for C++. libmsgpackc.[a|so] is the library file for C. Since version 1.0.0, the C++ parts of msgpack-c is a header only library. So libmsgpack.* shouldn't be generated. On the autotools building environment, removed libmsgpack.* generation. On the cmake building environment, replaced libmsgpack.* with libmsgpackc.* and set so-version to 2.0.0.
This commit is contained in:
		@@ -56,9 +56,9 @@ IF (MSGPACK_CXX11)
 | 
			
		||||
ENDIF ()
 | 
			
		||||
 | 
			
		||||
IF (MSGPACK_ENABLE_SHARED)
 | 
			
		||||
    SET (MSGPACK_TEST_LIB msgpack)
 | 
			
		||||
    SET (MSGPACK_TEST_LIB msgpackc)
 | 
			
		||||
ELSE ()
 | 
			
		||||
    SET (MSGPACK_TEST_LIB msgpack-static)
 | 
			
		||||
    SET (MSGPACK_TEST_LIB msgpackc-static)
 | 
			
		||||
ENDIF ()
 | 
			
		||||
 | 
			
		||||
FOREACH (source_file ${check_PROGRAMS})
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
AM_CPPFLAGS   = -I$(top_srcdir)/include -pthread
 | 
			
		||||
AM_C_CPPFLAGS = -I$(top_srcdir)/include -pthread
 | 
			
		||||
AM_LDFLAGS = $(top_builddir)/src/libmsgpack.la -lgtest_main -lgtest -lpthread
 | 
			
		||||
AM_LDFLAGS = $(top_builddir)/src/libmsgpackc.la -lgtest_main -lgtest -lpthread
 | 
			
		||||
 | 
			
		||||
check_PROGRAMS = \
 | 
			
		||||
		array_ref \
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user