[DRTVWR-476] - legacy_stdio_definitions shld be the last library linked

master
Anchor 2019-05-08 17:37:05 -06:00 committed by Nat Goodspeed
parent 0ed3724c95
commit e039f5e29e
3 changed files with 8 additions and 4 deletions

View File

@ -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})")

View File

@ -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)

View File

@ -1977,6 +1977,10 @@ endif (WINDOWS)
# dumped into the target binary and runtime lookup will find the most
# modern version.
if (WINDOWS)
list(APPEND LLAPPEARANCE_LIBRARIES legacy_stdio_definitions)
endif (WINDOWS)
target_link_libraries(${VIEWER_BINARY_NAME}
${PNG_PRELOAD_ARCHIVES}
${ZLIB_PRELOAD_ARCHIVES}