aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglachancecmaisonneuve <glachance@cmaisonneuve.qc.ca>2017-09-14 13:19:50 -0400
committerglachancecmaisonneuve <glachance@cmaisonneuve.qc.ca>2017-09-14 13:19:50 -0400
commite93b7aca655007efbcd715857f7cefaa617b8089 (patch)
tree76649e92a173647e21cfed1a207b2cbfaf1dd8cc
parentac55080e02eb1f6275f384ba60826751bddaef9c (diff)
downloadvcpkg-e93b7aca655007efbcd715857f7cefaa617b8089.tar.gz
vcpkg-e93b7aca655007efbcd715857f7cefaa617b8089.zip
Dynamic build -> Static without failing the build
-rw-r--r--ports/chmlib/portfile.cmake31
1 files changed, 12 insertions, 19 deletions
diff --git a/ports/chmlib/portfile.cmake b/ports/chmlib/portfile.cmake
index febf6fc58..74cc746d6 100644
--- a/ports/chmlib/portfile.cmake
+++ b/ports/chmlib/portfile.cmake
@@ -1,5 +1,5 @@
-if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
- message(FATAL_ERROR "CHMLIB SUPPORTS STATIC LINKING ONLY.")
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ message(STATUS "Warning: Dynamic building not supported. Building static.")
endif()
set(CHMLIB_VERSION chmlib-0.40)
@@ -23,9 +23,8 @@ vcpkg_build_msbuild(
PROJECT_PATH ${CHMLIB_SRC}/chm.vcxproj
RELEASE_CONFIGURATION Release
DEBUG_CONFIGURATION Debug
- OPTIONS_DEBUG /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
- OPTIONS_RELEASE /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- OPTIONS /v:diagnostic /p:SkipInvalidConfigurations=true
+ TARGET Build
+ OPTIONS /v:diagnostic
)
#enum_chmLib RELEASE only
@@ -34,9 +33,7 @@ vcpkg_build_msbuild(
RELEASE_CONFIGURATION Release
DEBUG_CONFIGURATION Release
TARGET Build
- OPTIONS_DEBUG /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- OPTIONS_RELEASE /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- OPTIONS /v:diagnostic /p:SkipInvalidConfigurations=true
+ OPTIONS /v:diagnostic
)
#enumdir_chmLib RELEASE only
@@ -45,9 +42,7 @@ vcpkg_build_msbuild(
RELEASE_CONFIGURATION Release
DEBUG_CONFIGURATION Release
TARGET Build
- OPTIONS_DEBUG /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- OPTIONS_RELEASE /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- OPTIONS /v:diagnostic /p:SkipInvalidConfigurations=true
+ OPTIONS /v:diagnostic
)
#extract_chmLib RELEASE only
@@ -56,17 +51,15 @@ vcpkg_build_msbuild(
RELEASE_CONFIGURATION Release
DEBUG_CONFIGURATION Release
TARGET Build
- OPTIONS_DEBUG /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- OPTIONS_RELEASE /p:OutDirPath="${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- OPTIONS /v:diagnostic /p:SkipInvalidConfigurations=true
+ OPTIONS /v:diagnostic
)
file(INSTALL ${CHMLIB_SRC}/chm_lib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/chm.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/chm.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/enum_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/enumdir_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/extract_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/chm.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-dbg/chm.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/enum_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/enumdir_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${VCPKG_TARGET_ARCHITECTURE}-windows-static-rel/extract_chmLib.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
file(COPY ${CURRENT_BUILDTREES_DIR}/src/chmlib-0.40/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/chmlib)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/chmlib/COPYING ${CURRENT_PACKAGES_DIR}/share/chmlib/copyright) \ No newline at end of file