diff options
| author | yurybura <yurybura@gmail.com> | 2018-03-12 19:51:25 +0300 |
|---|---|---|
| committer | yurybura <yurybura@gmail.com> | 2018-03-12 19:51:25 +0300 |
| commit | 23a876d2177992b90d47c7acf2b8dd30e93c581f (patch) | |
| tree | 6aa340233ff39d749ba6fe723528b8293a2b7b3b | |
| parent | cc3d12b16b84377368e5e5b001aeb75877d85ce5 (diff) | |
| download | vcpkg-23a876d2177992b90d47c7acf2b8dd30e93c581f.tar.gz vcpkg-23a876d2177992b90d47c7acf2b8dd30e93c581f.zip | |
[gtest] Fix issue #2373
| -rw-r--r-- | ports/gtest/portfile.cmake | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index b1f9e5dce..b5f3e58c8 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -25,6 +25,7 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_GMOCK=ON -DBUILD_GTEST=ON + -DCMAKE_DEBUG_POSTFIX=d -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT} ) @@ -60,12 +61,12 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock.dll ${CURRENT_PACKAGES_DIR}/bin/gmock.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.dll ${CURRENT_PACKAGES_DIR}/bin/gmock_main.dll) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.dll) +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.dll) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin/) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_main.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest_main.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_main.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock_main.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtestd.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gtest_maind.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmockd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmockd.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.dll ${CURRENT_PACKAGES_DIR}/debug/bin/gmock_maind.dll) endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.lib) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) @@ -74,12 +75,12 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock_main.lib) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.lib) +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.lib) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtestd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_main.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmockd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtestd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtestd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmockd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmockd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib) endif() vcpkg_copy_pdbs() |