diff options
| author | Anchor <none@none> | 2019-05-08 17:37:05 -0600 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 18:39:20 -0400 |
| commit | e039f5e29ee02c37d2febc21b492a0d425661897 (patch) | |
| tree | 561f82dbc04fcba13992ab777928551865cfac30 /indra/cmake | |
| parent | 0ed3724c95eb8d3c1daf50657d53d68641d576df (diff) | |
[DRTVWR-476] - legacy_stdio_definitions shld be the last library linked
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index ee6396e473..983b0bc3a9 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -208,6 +208,10 @@ FUNCTION(LL_ADD_INTEGRATION_TEST ${PTHREAD_LIBRARY} ) + if (WINDOWS) + list(APPEND libraries legacy_stdio_definitions) + endif (WINDOWS) + # Add test executable build target if(TEST_DEBUG) message(STATUS "ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})") diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index f56d1811d1..8900419f9b 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -33,10 +33,6 @@ else (LINUX) ${BOOST_SYSTEM_LIBRARY} ) endif (LINUX) -if (WINDOWS) - list(APPEND LLCOMMON_LIBRARIES legacy_stdio_definitions) -endif (WINDOWS) - set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a static library.") if(LLCOMMON_LINK_SHARED) add_definitions(-DLL_COMMON_LINK_SHARED=1) |