Author: brane
Date: Sun Sep 23 20:04:37 2018
New Revision: 1841782
URL: http://svn.apache.org/viewvc?rev=1841782&view=rev
Log:
Remove obsolete bits from the CMake build now that we use targets properly.
* CMakeLists.txt:
Stop using SerfWindowsProcessOpenSSL() and SerfWindowsProcessZLIB().
* build/SerfWindowsToolkit.cmake
(SerfWindowsProcessOpenSSL, SerfWindowsProcessZLIB): Remove, obsolete.
Modified:
serf/trunk/CMakeLists.txt
serf/trunk/build/SerfWindowsToolkit.cmake
Modified: serf/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1841782&r1=1841781&r2=1841782&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Sun Sep 23 20:04:37 2018
@@ -197,12 +197,6 @@ find_package(ZLIB)
find_package(APR)
find_package(APRUtil)
-if(SERF_WINDOWS)
- # Find ZLIB and OpenSSL runtime libraries etc.
- SerfWindowsProcessOpenSSL()
- SerfWindowsProcessZLIB()
-endif(SERF_WINDOWS)
-
# Calculate the set of private and public targets
set(SERF_PRIVATE_TARGETS OpenSSL::Crypto OpenSSL::SSL ZLIB::ZLIB)
Modified: serf/trunk/build/SerfWindowsToolkit.cmake
URL:
http://svn.apache.org/viewvc/serf/trunk/build/SerfWindowsToolkit.cmake?rev=1841782&r1=1841781&r2=1841782&view=diff
==============================================================================
--- serf/trunk/build/SerfWindowsToolkit.cmake (original)
+++ serf/trunk/build/SerfWindowsToolkit.cmake Sun Sep 23 20:04:37 2018
@@ -17,24 +17,6 @@
# under the License.
# ===================================================================
-# This function defines:
-# SERF_OPENSSL_STATIC, if we're linking with a static libraries.
-# SERF_OPENSSL_EXTRA_LIBS, if we need additional libraries to link.
-# SERF_OPENSSL_RUNTIME_LIBS, when it finds OpenSSL DLL libraries.
-function(SerfWindowsProcessOpenSSL)
- if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- endif()
-endfunction(SerfWindowsProcessOpenSSL)
-
-# This function defines:
-# SERF_ZLIB_STATIC, if we're linking with a static libraries.
-# SERF_ZLIB_EXTRA_LIBS, if we need additional libraries to link.
-# SERF_ZLIB_RUNTIME_LIBS, when it finds OpenSSL DLL libraries.
-function(SerfWindowsProcessZLIB)
- if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- endif()
-endfunction(SerfWindowsProcessZLIB)
-
# Generate a Windows DLL .def file from a list of headers.
function(SerfWindowsGenDef blacklist_ target_)
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
