mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 01:19:08 +08:00
c9ba340993
* Add portaudio:: namespace * Switch from vcpkg_from_git to vcpkg_from_github * Convert portfile to unix line-endings * Increase port-version of portaudio * Update version hash of portaudio * Remove namespace patch Signed-off-by: Hendrik <git@h3ndrk.de> * Update version hash of portaudio * Fix indent issue * Update the baseline version * Fix the port version * Fix baseline version * Remove redundant tag in portfile * Update version hash of portaudio Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
17 lines
738 B
Diff
17 lines
738 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 122fe93..b571c38 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -360,11 +360,6 @@ ENDIF()
|
|
# embedded builds this is not an issue as they will only build the configuration
|
|
# used in the host application.
|
|
MARK_AS_ADVANCED(PA_LIBNAME_ADD_SUFFIX)
|
|
-IF(MSVC AND PA_BUILD_STATIC AND PA_BUILD_SHARED AND NOT PA_LIBNAME_ADD_SUFFIX)
|
|
- MESSAGE(WARNING "Building both shared and static libraries, and avoiding the suffix _static will lead to a name conflict")
|
|
- SET(PA_LIBNAME_ADD_SUFFIX ON CACHE BOOL "Forcing use of suffix _static to avoid name conflict between static and import library" FORCE)
|
|
- MESSAGE(WARNING "PA_LIBNAME_ADD_SUFFIX was set to ON")
|
|
-ENDIF()
|
|
|
|
SET(PA_TARGETS "")
|
|
|