diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-06-05 15:03:52 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-06-05 15:03:58 +0000 |
| commit | 027aae1cd39f8cf9ce220fd20b94a9780d3b167e (patch) | |
| tree | f0c7ee9e78b6a894ca5f94bd73553036deb9ba70 /cmake | |
| parent | c60a6580c935c68d8bb82a84f0359b46b1bf06a5 (diff) | |
| download | wireshark-027aae1cd39f8cf9ce220fd20b94a9780d3b167e.tar.gz wireshark-027aae1cd39f8cf9ce220fd20b94a9780d3b167e.tar.bz2 wireshark-027aae1cd39f8cf9ce220fd20b94a9780d3b167e.zip | |
Revert "More 2.4 initialization."
This reverts commit c60a6580c935c68d8bb82a84f0359b46b1bf06a5.
Wrong branch.
Change-Id: I846b26d09bf1ab99d3f42baf35f1a63f1dd806d2
Reviewed-on: https://code.wireshark.org/review/21967
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindWSWinLibs.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake index 2b1746476d..05e53b0117 100644 --- a/cmake/modules/FindWSWinLibs.cmake +++ b/cmake/modules/FindWSWinLibs.cmake @@ -16,7 +16,7 @@ function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR ) file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR ) else() file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR ) - set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs-2.4" ) + set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" ) endif() endif() file( GLOB _SUBDIR "${_PROJECT_LIB_DIR}/*" ) |