mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-08 01:41:38 +08:00
0997386f6b
* update comms, add tools feature; update commsdsl * update versions * update comms-ublox * update version * add quotes to paths * version * fix comms dir remove * version * remove VCPKG_POLICY_DLLS_WITHOUT_LIBS * version * fix some paths * version * only allow build of tools if triplet is dynamic * version * fail on static * version * replace deprecated functions and replace options * version * fix * fix 2 * update version * apply @JackBoosY suggestions * version * Update ports/comms/portfile.cmake * Update versions/c-/comms.json * add @NancyLi1013 suggestions * update versions Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
24 lines
814 B
Diff
24 lines
814 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e2b69fe..aff5917 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -66,6 +66,7 @@ endif ()
|
|
######################################################################
|
|
|
|
# Use external CommsChampion project or compile it in place
|
|
+if(FALSE)
|
|
set (CC_EXTERNAL_TGT "comms_champion_external")
|
|
if (OPT_BUILD_TEST OR OPT_BUILD_PLUGIN)
|
|
set (external_cc_needed TRUE)
|
|
@@ -107,6 +108,10 @@ elseif (external_cc_needed)
|
|
find_package(CommsChampion NO_MODULE)
|
|
set (cc_compile_file "${OPT_CC_MAIN_INSTALL_DIR}/lib/LibComms/cmake/CC_Compile.cmake")
|
|
endif ()
|
|
+else()
|
|
+ find_package(LibComms CONFIG REQUIRED)
|
|
+ set(cc_compile_file "${LibComms_DIR}/CC_Compile.cmake")
|
|
+endif()
|
|
|
|
if (EXISTS ${cc_compile_file})
|
|
# Set compiler flags
|