Fix link error against crypto32; update screenshots for configure on Mac.

6 years ago · ddd521b684
parent 2fe4024511
commit ddd521b684
6 changed files with 15 additions and 3 deletions
--- a/autotest/CMakeLists.txt
+++ b/autotest/CMakeLists.txt
@ -10,7 +10,11 @@ set(AT_TARGET_NAME webcc_autotest)
 set(AT_LIBS webcc ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")

 if(WEBCC_ENABLE_SSL)
-    set(AT_LIBS ${AT_LIBS} ${OPENSSL_LIBRARIES} crypt32)
+    set(AT_LIBS ${AT_LIBS} ${OPENSSL_LIBRARIES})
+
+    if(WIN32)
+        set(AT_LIBS ${AT_LIBS} crypt32)
+    endif()
 endif()

 if(WEBCC_ENABLE_GZIP)
--- a/doc/screenshots/cmake_config_mac.png
+++ b/doc/screenshots/cmake_config_mac.png
--- a/doc/screenshots/cmake_config_mac_2.png
+++ b/doc/screenshots/cmake_config_mac_2.png
--- a/doc/screenshots/cmake_config_mac_openssl.png
+++ b/doc/screenshots/cmake_config_mac_openssl.png
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@ -4,7 +4,11 @@
 set(EXAMPLE_LIBS webcc ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")

 if(WEBCC_ENABLE_SSL)
-    set(EXAMPLE_LIBS ${EXAMPLE_LIBS} ${OPENSSL_LIBRARIES} crypt32)
+    set(EXAMPLE_LIBS ${EXAMPLE_LIBS} ${OPENSSL_LIBRARIES})
+
+    if(WIN32)
+        set(EXAMPLE_LIBS ${EXAMPLE_LIBS} crypt32)
+    endif()
 endif()

 if(WEBCC_ENABLE_GZIP)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@ -13,7 +13,11 @@ set(UT_TARGET_NAME webcc_unittest)
 set(UT_LIBS webcc ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")

 if(WEBCC_ENABLE_SSL)
-    set(UT_LIBS ${UT_LIBS} ${OPENSSL_LIBRARIES} crypt32)
+    set(UT_LIBS ${UT_LIBS} ${OPENSSL_LIBRARIES})
+
+    if(WIN32)
+        set(UT_LIBS ${UT_LIBS} crypt32)
+    endif()
 endif()

 if(WEBCC_ENABLE_GZIP)