Remove helper CMake script; do everything in the portfile

2 files changed, 66 insertions, 93 deletions

diff --git a/ports/openssl/CMakeLists.txt b/ports/openssl/CMakeLists.txt
deleted file mode 100644
index fb23f2fe6..000000000
--- a/ports/openssl/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(openssl NONE)
-
-include(vcpkg_execute_required_process)
-set(SOURCE_PATH ${CMAKE_CURRENT_BINARY_DIR}/openssl-${OPENSSL_VERSION})
-
-find_program(PERL perl)
-find_program(NMAKE nmake)
-
-if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    file(COPY ${OPENSSL_SOURCE_MASTER_COPY} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-else()
-    file(COPY ${OPENSSL_SOURCE_MASTER_COPY} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-endif()
-
-set(CONFIGURE_COMMAND ${PERL} Configure
-    enable-static-engine
-    enable-capieng
-    no-asm
-    no-ssl2
-)
-
-if(TARGET_TRIPLET MATCHES "x86-windows")
-    set(OPENSSL_ARCH VC-WIN32)
-    set(OPENSSL_DO "ms\\do_ms.bat")
-elseif(TARGET_TRIPLET MATCHES "x64")
-    set(OPENSSL_ARCH VC-WIN64A)
-    set(OPENSSL_DO "ms\\do_win64a.bat")
-else()
-    message(FATAL_ERROR "Unsupported target triplet: ${TARGET_TRIPLET}")
-endif()
-
-if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    set(OPENSSLDIR ${CURRENT_PACKAGES_DIR}/debug)
-    list(APPEND CONFIGURE_COMMAND
-        debug-${OPENSSL_ARCH}
-        "--prefix=${OPENSSLDIR}"
-        "--openssldir=${OPENSSLDIR}"
-    )
-else()
-    set(OPENSSLDIR ${CURRENT_PACKAGES_DIR})
-    list(APPEND CONFIGURE_COMMAND
-        ${OPENSSL_ARCH}
-        "--prefix=${OPENSSLDIR}"
-        "--openssldir=${OPENSSLDIR}"
-    )
-endif()
-
-vcpkg_execute_required_process(
-    COMMAND ${CONFIGURE_COMMAND}
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}
-)
-vcpkg_execute_required_process(
-    COMMAND ${OPENSSL_DO}
-    WORKING_DIRECTORY ${SOURCE_PATH}
-    LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}
-)
-
-if(BUILD_SHARED_LIBS)
-    add_custom_command(OUTPUT ${OPENSSLDIR}/bin/ssleay32.dll ${OPENSSLDIR}/bin/libeay32.dll
-        COMMAND ${NMAKE} -f ms\\ntdll.mak install
-        WORKING_DIRECTORY ${SOURCE_PATH}
-    )
-    add_custom_target(openssl ALL DEPENDS ${OPENSSLDIR}/bin/ssleay32.dll ${OPENSSLDIR}/bin/libeay32.dll)
-else()
-    add_custom_command(OUTPUT ${OPENSSLDIR}/bin/ssleay32.lib ${OPENSSLDIR}/bin/libeay32.lib
-        COMMAND ${NMAKE} -f ms\\nt.mak install
-        WORKING_DIRECTORY ${SOURCE_PATH}
-    )
-    add_custom_target(openssl ALL DEPENDS ${OPENSSLDIR}/bin/ssleay32.lib ${OPENSSLDIR}/bin/libeay32.lib)
-endif()
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index cca604246..b325432b0 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -5,7 +5,7 @@ endif()
 
 include(vcpkg_common_functions)
 set(OPENSSL_VERSION 1.0.2k)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
+set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 vcpkg_find_acquire_program(PERL)
 find_program(NMAKE nmake)
 
@@ -20,41 +20,86 @@ vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
 
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
 vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH ${MASTER_COPY_SOURCE_PATH}
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/PerlScriptSpaceInPathFixes.patch
             ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch
             ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    GENERATOR "NMake Makefiles"
-    OPTIONS
-        -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
-        -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}
-        -DCURRENT_BUILDTREES_DIR=${CURRENT_BUILDTREES_DIR}
-        -DOPENSSL_SOURCE_MASTER_COPY=${SOURCE_PATH}
-        -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
-        -DTRIPLET_SYSTEM_ARCH=${TRIPLET_SYSTEM_ARCH}
-        -DOPENSSL_VERSION=${OPENSSL_VERSION}
-        -DTARGET_TRIPLET=${TARGET_TRIPLET}
+set(CONFIGURE_COMMAND ${PERL} Configure
+    enable-static-engine
+    enable-capieng
+    no-asm
+    no-ssl2
 )
 
+if(TARGET_TRIPLET MATCHES "x86-windows")
+    set(OPENSSL_ARCH VC-WIN32)
+    set(OPENSSL_DO "ms\\do_ms.bat")
+elseif(TARGET_TRIPLET MATCHES "x64")
+    set(OPENSSL_ARCH VC-WIN64A)
+    set(OPENSSL_DO "ms\\do_win64a.bat")
+else()
+    message(FATAL_ERROR "Unsupported target triplet: ${TARGET_TRIPLET}")
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+
 message(STATUS "Build ${TARGET_TRIPLET}-rel")
+file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-${OPENSSL_VERSION})
+set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR})
+
 vcpkg_execute_required_process(
-    COMMAND ${CMAKE_COMMAND} --build .
-    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-    LOGNAME build-${TARGET_TRIPLET}-rel
+    COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}"
+    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+    LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
 )
+vcpkg_execute_required_process(
+    COMMAND ${OPENSSL_DO}
+    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+    LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_execute_required_process(COMMAND ${NMAKE} -f ms\\ntdll.mak install
+                                   WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+                                   LOGNAME build-${TARGET_TRIPLET}-rel)
+else()
+    vcpkg_execute_required_process(COMMAND ${NMAKE} -f ms\\nt.mak install
+                                   WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+                                   LOGNAME build-${TARGET_TRIPLET}-rel)
+endif()
+
+
 message(STATUS "Build ${TARGET_TRIPLET}-rel done")
 
 message(STATUS "Build ${TARGET_TRIPLET}-dbg")
+file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/openssl-${OPENSSL_VERSION})
+set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug)
+
+vcpkg_execute_required_process(
+    COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}"
+    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+    LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
+)
 vcpkg_execute_required_process(
-    COMMAND ${CMAKE_COMMAND} --build .
-    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-    LOGNAME build-${TARGET_TRIPLET}-dbg
+    COMMAND ${OPENSSL_DO}
+    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+    LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
 )
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_execute_required_process(COMMAND ${NMAKE} -f ms\\ntdll.mak install
+                                   WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+                                   LOGNAME build-${TARGET_TRIPLET}-dbg)
+else()
+    vcpkg_execute_required_process(COMMAND ${NMAKE} -f ms\\nt.mak install
+                                   WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+                                   LOGNAME build-${TARGET_TRIPLET}-dbg)
+endif()
+
 message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)