From 1f0a722d0db68c11419102223911697959cdf077 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 8 Aug 2014 10:17:29 -0700 Subject: [PATCH] remove antequated windows libraries that have been replaced by Qt usage --- assignment-client/CMakeLists.txt | 4 ---- domain-server/CMakeLists.txt | 4 ---- tests/audio/CMakeLists.txt | 5 ----- tests/jitter/CMakeLists.txt | 7 +------ tests/metavoxels/CMakeLists.txt | 4 ---- tests/networking/CMakeLists.txt | 4 ---- 6 files changed, 1 insertion(+), 27 deletions(-) diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index d4281eb185..ab448bc5bd 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -14,9 +14,5 @@ if (UNIX) target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES} ${CMAKE_DL_LIBS}) endif (UNIX) -IF (WIN32) - target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES} Winmm Ws2_32) -ENDIF(WIN32) - find_package(Qt5 COMPONENTS Gui Network Script Widgets) target_link_libraries(${TARGET_NAME} Qt5::Gui Qt5::Network Qt5::Script Qt5::Widgets) diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index c04ba33a5d..7f9dc2db37 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -14,9 +14,5 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD # link the shared hifi library link_hifi_libraries(${TARGET_NAME} embedded-webserver networking shared) -IF (WIN32) - target_link_libraries(${TARGET_NAME} Winmm Ws2_32) -ENDIF(WIN32) - find_package(Qt5 COMPONENTS Network Widgets) target_link_libraries(${TARGET_NAME} Qt5::Network) diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt index 15da1afaa1..51b42780c8 100644 --- a/tests/audio/CMakeLists.txt +++ b/tests/audio/CMakeLists.txt @@ -7,8 +7,3 @@ include_glm(${TARGET_NAME} ${ROOT_DIR}) # link in the shared libraries link_hifi_libraries(${TARGET_NAME} shared audio networking) - -IF (WIN32) - target_link_libraries(${TARGET_NAME} Winmm Ws2_32) -ENDIF(WIN32) - diff --git a/tests/jitter/CMakeLists.txt b/tests/jitter/CMakeLists.txt index 3b1d544690..4fb3d56492 100644 --- a/tests/jitter/CMakeLists.txt +++ b/tests/jitter/CMakeLists.txt @@ -3,9 +3,4 @@ set(TARGET_NAME jitter-tests) setup_hifi_project(${TARGET_NAME} TRUE) # link in the shared libraries -link_hifi_libraries(${TARGET_NAME} shared networking) - -IF (WIN32) - target_link_libraries(${TARGET_NAME} Winmm Ws2_32) -ENDIF(WIN32) - +link_hifi_libraries(${TARGET_NAME} shared networking) \ No newline at end of file diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt index 233988f849..d459ea1fed 100644 --- a/tests/metavoxels/CMakeLists.txt +++ b/tests/metavoxels/CMakeLists.txt @@ -9,9 +9,5 @@ setup_hifi_project(${TARGET_NAME} TRUE "${AUTOMTC_SRC}") # link in the shared libraries link_hifi_libraries(${TARGET_NAME} metavoxels networking shared) -IF (WIN32) - target_link_libraries(${TARGET_NAME} Winmm Ws2_32) -ENDIF(WIN32) - target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script) diff --git a/tests/networking/CMakeLists.txt b/tests/networking/CMakeLists.txt index 819229d28f..ec48bb80cd 100644 --- a/tests/networking/CMakeLists.txt +++ b/tests/networking/CMakeLists.txt @@ -5,7 +5,3 @@ setup_hifi_project(${TARGET_NAME} TRUE) # link in the shared libraries link_hifi_libraries(${TARGET_NAME} shared networking) -IF (WIN32) - target_link_libraries(${TARGET_NAME} Winmm Ws2_32) -ENDIF(WIN32) -