3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 13:28:01 +08:00
Code Issues Projects Releases Wiki Activity

[moos-core]Fix build failure on Windows (#6252)

Browse Source 
* [moos-core]Fix build in windows:
1.Add compile macros and includes
2.Fix empty directories in static.

* [moos-core]Fix link error LNK2019.

* [moos-core]Changed library linkage to static.

* Clean up tool + copyright install; Remove messages
This commit is contained in:
JackBoosY 2019-05-08 04:35:30 +08:00 committed by Griffin Downs
parent 1fab043632
commit 801d0ce8a4
2 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/moos-core/CONTROL
View File

@ -1,4 +1,3 @@
Source: moos-core
Version: 10.4.0-1
Description: A very light weight, easy to use middleware. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
Build-Depends:
Source: moos-core
Version: 10.4.0-2
Description: A very light weight, easy to use middleware. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.

39
ports/moos-core/portfile.cmake
View File

@ -1,16 +1,15 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO themoos/core-moos
REF v10.4.0
SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake_fix.patch
PATCHES
cmake_fix.patch
)
message(STATUS "MOOS VCPKG SOURCE_PATH ${SOURCE_PATH}")
@ -20,6 +19,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_SHARED_LIBS=OFF
-DCMAKE_ENABLE_EXPORT=OFF
)
@ -27,28 +27,15 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/MOOS")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/MOOS)
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/MOOSDB")
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/MOOSDB ${CURRENT_PACKAGES_DIR}/tools/MOOS/MOOSDB)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/atm ${CURRENT_PACKAGES_DIR}/tools/MOOS/atm)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/gtm)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ktm ${CURRENT_PACKAGES_DIR}/tools/MOOS/ktm)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mqos ${CURRENT_PACKAGES_DIR}/tools/MOOS/mqos)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/mtm)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/umm ${CURRENT_PACKAGES_DIR}/tools/MOOS/umm)
set(MOOS_EXEC_SUFFIX "")
if (WIN32)
set(MOOS_EXEC_SUFFIX ".exe")
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Stage tools
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
# Put the licence file where vcpkg expects it
file(COPY
${SOURCE_PATH}/Core/GPLCore.txt
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(RENAME
${CURRENT_PACKAGES_DIR}/share/${PORT}/GPLCore.txt
${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
file(COPY ${SOURCE_PATH}/Core/GPLCore.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)