cmake: Remove alias from package config

The cmake target of an alias may not be an Imported Target.
Always build the msgpackc target and only build the msgpackc-static
target if both should be build to fix issue #801. Thereby the type
(shared or static) of the msgpackc target depends on the build
configuration.

Author: herbrechtsmeier

CMakeLists.txt

@@ -181,6 +181,7 @@ ELSE ()
     IF (NOT DEFINED MSGPACK_ENABLE_STATIC)
         SET (MSGPACK_ENABLE_STATIC ON)
     ENDIF ()
+    SET (BUILD_SHARED_LIBS ${MSGPACK_ENABLE_SHARED})
 ENDIF ()
 
 OPTION (MSGPACK_ENABLE_CXX "Enable C++ interface." ON)
@@ -209,8 +210,9 @@ CONFIGURE_FILE (
     @ONLY
 )
 
-IF (MSGPACK_ENABLE_SHARED)
-    ADD_LIBRARY (msgpackc SHARED
+
+IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
+    ADD_LIBRARY (msgpackc
         ${msgpackc_SOURCES}
         ${msgpackc_HEADERS}
     )
@@ -238,7 +240,7 @@ IF (MSGPACK_ENABLE_CXX AND ((CMAKE_VERSION VERSION_GREATER 3.0) OR (CMAKE_VERSIO
     )
 ENDIF ()
 
-IF (MSGPACK_ENABLE_STATIC)
+IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
     ADD_LIBRARY (msgpackc-static STATIC
         ${msgpackc_SOURCES}
         ${msgpackc_HEADERS}
@@ -253,11 +255,6 @@ IF (MSGPACK_ENABLE_STATIC)
             ${CMAKE_CURRENT_SOURCE_DIR}
     )
 
-    IF (NOT MSGPACK_ENABLE_SHARED)
-        # Add alias for subdirectories
-        ADD_LIBRARY (msgpackc ALIAS msgpackc-static)
-    ENDIF ()
-
     SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
 
     IF (MSGPACK_ENABLE_SHARED)
@@ -291,19 +288,19 @@ IF (MSGPACK_BUILD_TESTS)
 ENDIF ()
 
 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    IF (MSGPACK_ENABLE_SHARED)
+    IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
     ENDIF ()
-    IF (MSGPACK_ENABLE_STATIC)
+    IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
     ENDIF ()
 ENDIF ()
 
 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    IF (MSGPACK_ENABLE_SHARED)
+    IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
     ENDIF ()
-    IF (MSGPACK_ENABLE_STATIC)
+    IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
         SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
     ENDIF ()
 ENDIF ()
@@ -337,15 +334,15 @@ IF (MSGPACK_BUILD_EXAMPLES)
     ADD_SUBDIRECTORY (example)
 ENDIF ()
 
-IF (MSGPACK_ENABLE_SHARED)
+IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
     SET (MSGPACK_INSTALLTARGETS msgpackc)
 ENDIF ()
 
 IF (MSGPACK_ENABLE_CXX AND ((CMAKE_VERSION VERSION_GREATER 3.0) OR (CMAKE_VERSION VERSION_EQUAL 3.0)))
     LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-cxx)
 ENDIF ()
 
-IF (MSGPACK_ENABLE_STATIC)
+IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
     LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static)
 ENDIF ()
 

example/c/CMakeLists.txt

@@ -1,12 +1,3 @@
-IF (MSGPACK_ENABLE_SHARED)
-    SET (MSGPACK_LIB msgpackc)
-ENDIF ()
-
-IF (MSGPACK_ENABLE_STATIC)
-    SET (MSGPACK_LIB msgpackc-static)
-ENDIF ()
-
-
 LIST (APPEND exec_PROGRAMS
     lib_buffer_unpack.c
     simple_c.c
@@ -22,7 +13,7 @@ FOREACH (source_file ${exec_PROGRAMS})
         ${source_file}
     )
     TARGET_LINK_LIBRARIES (${source_file_we}
-        ${MSGPACK_LIB}
+        msgpackc
     )
     IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")

msgpack-config.cmake.in

@@ -6,8 +6,9 @@
 #
 # ::
 #
-#   msgpackc-static
 #   msgpackc
+#   msgpackc-cxx
+#   msgpackc-static (optional)
 #
 
 @PACKAGE_INIT@
@@ -16,8 +17,4 @@ include(CMakeFindDependencyMacro)
 
 if(NOT TARGET msgpackc AND NOT TARGET msgpackc-static)
   include("${CMAKE_CURRENT_LIST_DIR}/msgpack-targets.cmake")
-
-  if(NOT @MSGPACK_ENABLE_SHARED@)
-    add_library(msgpackc ALIAS msgpackc-static)
-  endif()
 endif()