diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-24 15:54:47 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-24 23:55:15 +0000 |
| commit | 153c63d3ffafec2c453a847318eb6562ac034af5 (patch) | |
| tree | 4e643282bb0e57a7e769ff3cc85f23e86e24a137 /wsutil/CMakeLists.txt | |
| parent | c01bad2c902ce412f4c0b8d581e7be64872bdb5a (diff) | |
| download | wireshark-153c63d3ffafec2c453a847318eb6562ac034af5.tar.gz | |
Don't use extra variables for ws_mempbrk_sse42.c and popcount.c
Instead, just add to WSUTIL_FILES as necessary.
Change-Id: Iecadbd9a66ec54ee5d90aecfbfe5e636ae56e27e
Reviewed-on: https://code.wireshark.org/review/6043
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil/CMakeLists.txt')
| -rw-r--r-- | wsutil/CMakeLists.txt | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 05b32815c1..7a2a19382a 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -32,18 +32,6 @@ if(WIN32) ) ENDIF(WIN32) -if(HAVE_SSE4_2) - set( WSUTIL_SSE42_FILES - ws_mempbrk_sse42.c - ) -endif() - -if(NOT HAVE_POPCOUNT) - set( WSUTIL_POPCOUNT_FILES - popcount.c - ) -endif() - set(WSUTIL_FILES adler32.c aes.c @@ -94,10 +82,16 @@ set(WSUTIL_FILES ws_mempbrk_sse42.c ws_version_info.c ${WSUTIL_PLATFORM_FILES} - ${WSUTIL_SSE42_FILES} - ${WSUTIL_POPCOUNT_FILES} ) +if(HAVE_SSE4_2) + set(WSUTIL_FILES ${WSUTIL_FILES} ws_mempbrk_sse42.c) +endif() + +if(NOT HAVE_POPCOUNT) + set(WSUTIL_FILES ${WSUTIL_FILES} popcount.c) +endif() + if(APPLE) # # We assume that APPLE means OS X so that we have the OS X |