Remove use of vcpkg_build_cmake() across all portfiles. Fixes #123

2016-10-06 15:29:37 -07:00 · 2016-10-06 15:29:37 -07:00 · b1fe038a83
--- a/ports/assimp/portfile.cmake
+++ b/ports/assimp/portfile.cmake
@ -25,7 +25,6 @@ vcpkg_configure_cmake(
    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@ -24,7 +24,6 @@ vcpkg_configure_cmake(
    -DBOND_LIBRARIES_ONLY=TRUE
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 # Put the license file where vcpkg expects it
--- a/ports/cocos2d/portfile.cmake
+++ b/ports/cocos2d/portfile.cmake
@ -40,7 +40,6 @@ vcpkg_configure_cmake(
        -DUSE_PREBUILT_LIBS=OFF
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(INSTALL ${SOURCE_PATH}/licenses/LICENSE_cocos2d-x.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cocos2d-x RENAME copyright)
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@ -41,7 +41,6 @@ vcpkg_configure_cmake(
        -DCASA_INSTALL_HEADERS=OFF
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(COPY ${CURRENT_BUILDTREES_DIR}/src/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpprestsdk)
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@ -17,7 +17,6 @@ vcpkg_configure_cmake(
        -DENABLE_DEBUG=ON
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright)
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@ -15,7 +15,6 @@ vcpkg_configure_cmake(
        -DBUILD_tools=OFF
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@ -14,7 +14,6 @@ vcpkg_configure_cmake(
        -DFMT_DOC=OFF
 )

-vcpkg_build_cmake()

 vcpkg_install_cmake()
 file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright)
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@ -18,7 +18,6 @@ vcpkg_configure_cmake(
        -DBUILD_SHARED_LIBS=ON
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include)
--- a/ports/gflags/portfile.cmake
+++ b/ports/gflags/portfile.cmake
@ -37,7 +37,6 @@ vcpkg_configure_cmake(
        -DBUILD_SHARED_LIBS=ON
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
--- a/ports/glfw3/portfile.cmake
+++ b/ports/glfw3/portfile.cmake
@ -32,7 +32,6 @@ vcpkg_configure_cmake(
    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(MAKE_DIRECTORY
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@ -39,7 +39,6 @@ vcpkg_configure_cmake(
        -DgRPC_PROTOBUF_PROVIDER=package
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/grpc)
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@ -37,8 +37,6 @@ vcpkg_configure_cmake(
        -DBUILD_SHARED_LIBS=ON
 )

-vcpkg_build_cmake()
-
 vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gtest RENAME copyright)
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@ -16,7 +16,6 @@ vcpkg_configure_cmake(
    
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 # Handle copyright
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@ -27,7 +27,6 @@ vcpkg_configure_cmake(
    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(COPY
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@ -34,7 +34,6 @@ vcpkg_configure_cmake(
        -DSKIP_INSTALL_HEADERS=ON
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 if(VCPKG_BUILD_SHARED_LIBS)
--- a/ports/libwebsockets/portfile.cmake
+++ b/ports/libwebsockets/portfile.cmake
@ -19,7 +19,6 @@ vcpkg_configure_cmake(
    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
--- a/ports/openal-soft/portfile.cmake
+++ b/ports/openal-soft/portfile.cmake
@ -19,7 +19,6 @@ vcpkg_configure_cmake(
        -DALSOFT_HRTF_DEFS=OFF
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@ -42,7 +42,6 @@ vcpkg_configure_cmake(
        -DINSTALL_OTHER=OFF
 )

-# vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(READ ${CURRENT_PACKAGES_DIR}/debug/share/opencv/OpenCVModules-debug.cmake OPENCV_DEBUG_MODULE)
--- a/ports/sdl2/portfile.cmake
+++ b/ports/sdl2/portfile.cmake
@ -34,7 +34,6 @@ else()
            -DSDL_STATIC=OFF
    )

-    vcpkg_build_cmake()
    vcpkg_install_cmake()

    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
--- a/ports/sery/portfile.cmake
+++ b/ports/sery/portfile.cmake
@ -14,7 +14,6 @@ vcpkg_configure_cmake(
    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 # Removes unnecessary directories
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@ -13,7 +13,6 @@ vcpkg_configure_cmake(
        -DSOURCE=${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-3120200
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(WRITE ${CURRENT_PACKAGES_DIR}/share/sqlite3/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n")
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@ -12,7 +12,6 @@ vcpkg_configure_cmake(
    OPTIONS -Dcxx=OFF
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(REMOVE_RECURSE
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@ -14,7 +14,6 @@ vcpkg_configure_cmake(
    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@ -16,7 +16,6 @@ vcpkg_configure_cmake(
        -DSKIP_INSTALL_HEADERS=ON
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 if(VCPKG_BUILD_SHARED_LIBS)
--- a/scripts/templates/portfile.in.cmake
+++ b/scripts/templates/portfile.in.cmake
@ -23,7 +23,6 @@ vcpkg_configure_cmake(
    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )

-vcpkg_build_cmake()
 vcpkg_install_cmake()

 # Handle copyright