]> The Tcpdump Group git mirrors - libpcap/commitdiff
Merge pull request #627 from sgeto/lib_prefix
authorGuy Harris <[email protected]>
Sat, 23 Sep 2017 19:24:44 +0000 (12:24 -0700)
committerGitHub <[email protected]>
Sat, 23 Sep 2017 19:24:44 +0000 (12:24 -0700)
Build the shared library without the "lib" prefix on MinGW as well.

CMakeLists.txt

index 826620409d8a2fb30a920a1b7d0f74d6611198ca..261f58f10044dc170eda33ba0f997e4227631f2f 100644 (file)
@@ -959,10 +959,17 @@ if(MSVC)
     if(BUILD_SHARED_LIBS)
         set_target_properties(${LIBRARY_NAME} PROPERTIES COMPILE_OPTIONS "/Zi")
     endif(BUILD_SHARED_LIBS)
-    set_target_properties(${LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}_static" COMPILE_OPTIONS "/Z7")
-else(MSVC)
+    set_target_properties(${LIBRARY_NAME}_static PROPERTIES COMPILE_OPTIONS "/Z7")
+elseif(MINGW)
+    #
+    # For compatibility, build the shared library without the "lib" prefix on
+    # MinGW as well.
+    #
+    set_target_properties(${LIBRARY_NAME} PROPERTIES PREFIX "" OUTPUT_NAME "${LIBRARY_NAME}")
     set_target_properties(${LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}")
-endif(MSVC)
+else()
+    set_target_properties(${LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}")
+endif()
 
 if(BUILD_SHARED_LIBS)
     target_link_libraries(${LIBRARY_NAME} ${PCAP_LINK_LIBRARIES})