Skip to content
Snippets Groups Projects
Commit 51606127 authored by Richard Linden's avatar Richard Linden
Browse files

fixed unit tests being generated as Windows GUI projects instead of console projects

parent 217a8533
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/cmake/LLAddBuildTest.cmake
+ 1
− 1
View file @ 51606127
...@@ -211,7 +211,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST ...@@ -211,7 +211,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
if (WINDOWS) if (WINDOWS)
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
PROPERTIES PROPERTIES
LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:CONSOLE"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
LINK_FLAGS_RELEASE "" LINK_FLAGS_RELEASE ""
) )
......
indra/llcorehttp/CMakeLists.txt
+ 1
− 1
View file @ 51606127
...@@ -174,7 +174,7 @@ if (LL_TESTS) ...@@ -174,7 +174,7 @@ if (LL_TESTS)
# The following come from LLAddBuildTest.cmake's INTEGRATION_TEST_xxxx target. # The following come from LLAddBuildTest.cmake's INTEGRATION_TEST_xxxx target.
set_target_properties(http_texture_load set_target_properties(http_texture_load
PROPERTIES PROPERTIES
LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:CONSOLE ${TCMALLOC_LINK_FLAGS}"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
LINK_FLAGS_RELEASE "" LINK_FLAGS_RELEASE ""
) )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment