diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-11 07:38:45 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-11 07:38:45 +0000 |
| commit | 8719cebf381fb9a289d9b690b11dbc67daee04ff (patch) | |
| tree | c27120e8bbb942cf44cd5fa7a926249a42f7463c /cmake/modules/FindWSWinLibs.cmake | |
| parent | 5db6b8ae2046bcabfd10bdd8e6197e6f96de18fd (diff) | |
Make airpcap detection work
svn path=/trunk/; revision=52535
Diffstat (limited to 'cmake/modules/FindWSWinLibs.cmake')
| -rw-r--r-- | cmake/modules/FindWSWinLibs.cmake | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake index dfb8203092..16e30ee067 100644 --- a/cmake/modules/FindWSWinLibs.cmake +++ b/cmake/modules/FindWSWinLibs.cmake @@ -8,11 +8,15 @@ # The function is passed the directory name to search for and the variable # to set in the callers scope. -function(FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR) - if (WIN32) - set( _WS_BASE_DIR $ENV{WIRESHARK_BASE_DIR} ) - set( _WS_TARGET_PLATFORM $ENV{WIRESHARK_TARGET_PLATFORM} ) - set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${_WS_TARGET_PLATFORM}-libs" ) +function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR ) + if( WIN32 ) + if( ARGN ) + set( _PROJECT_LIB_DIR ${ARGN} ) + else() + set( _WS_BASE_DIR $ENV{WIRESHARK_BASE_DIR} ) + set( _WS_TARGET_PLATFORM $ENV{WIRESHARK_TARGET_PLATFORM} ) + set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${_WS_TARGET_PLATFORM}-libs" ) + endif() file( GLOB _SUBDIR "${_PROJECT_LIB_DIR}/*" ) foreach( _DIR ${_SUBDIR} ) if( IS_DIRECTORY ${_DIR} ) @@ -24,8 +28,8 @@ function(FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR) endif() endfunction() -function(WSExtendPath _LIB_PATH_LIST _PATH_FILE) - if (WIN32) +function( WSExtendPath _LIB_PATH_LIST _PATH_FILE ) + if ( WIN32 ) #message( STATUS "All libs: ${_LIB_PATH_LIST}." ) foreach( THIS_LIB_PATH ${_LIB_PATH_LIST} ) get_filename_component( LIB_PATH ${THIS_LIB_PATH} PATH ) |