From 61f3ed5004603191f3aac89c266d958f4e284018 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Illera Date: Thu, 27 Oct 2022 00:26:17 +1100 Subject: remove proxy specific target_link_libraries for static --- libproxy/cmake/modules/pacrunner_duktape.cmk | 1 - utils/CMakeLists.txt | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/libproxy/cmake/modules/pacrunner_duktape.cmk b/libproxy/cmake/modules/pacrunner_duktape.cmk index 79e2058..781985d 100644 --- a/libproxy/cmake/modules/pacrunner_duktape.cmk +++ b/libproxy/cmake/modules/pacrunner_duktape.cmk @@ -8,7 +8,6 @@ if(WIN32) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${DUKTAPE_INCLUDE_DIRS}) link_libraries(${DUKTAPE_LIBRARY}) set(DUKTAPE_FOUND 1) # find_package sets DUKTAPE_FOUND to True and not 0 - set(LIBPROXY_LIBRARIES ${LIBPROXY_LIBRARIES} ${DUKTAPE_LIBRARY} PARENT_SCOPE) endif() endif() else() diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index de5cb81..53cf0c0 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,16 +1,5 @@ include_directories("../libproxy") add_executable(proxy proxy.c) - -if(BUILD_SHARED_LIBS) - target_link_libraries(proxy libproxy) -else () - if(WIN32) - target_link_libraries(proxy libproxy;modman;ws2_32;${LIBPROXY_LIBRARIES}) - else() - target_link_libraries(proxy libproxy;modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) - endif() -endif() - - -install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) +target_link_libraries(proxy libproxy) +install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) \ No newline at end of file -- cgit v1.2.1