From: Derek Barnett Date: Wed, 24 Jul 2013 18:48:09 +0000 (-0400) Subject: Changed platform check to use standard cmake variable (issue #66) X-Git-Url: https://git.donarmstrong.com/?p=bamtools.git;a=commitdiff_plain;h=5c424b7a45ca882fcd92edd9558ee0a89a8ff803 Changed platform check to use standard cmake variable (issue #66) - 'WIN32' instead of '_WIN32' --- diff --git a/src/api/internal/io/CMakeLists.txt b/src/api/internal/io/CMakeLists.txt index d9da416..28153d5 100644 --- a/src/api/internal/io/CMakeLists.txt +++ b/src/api/internal/io/CMakeLists.txt @@ -5,12 +5,12 @@ # src/api/internal/io # ========================== -set ( InternalIODir "${InternalDir}/io" ) +set( InternalIODir "${InternalDir}/io" ) #-------------------------- # platform-independent IO #-------------------------- -set ( CommonIOSources +set( CommonIOSources ${InternalIODir}/BamDeviceFactory_p.cpp ${InternalIODir}/BamFile_p.cpp ${InternalIODir}/BamFtp_p.cpp @@ -30,21 +30,17 @@ set ( CommonIOSources #------------------------ # platform-dependent IO #------------------------ -if ( _WIN32 ) - set ( PlatformIOSources - ${InternalIODir}/TcpSocketEngine_win_p.cpp - ) -else ( _WIN32 ) - set ( PlatformIOSources - ${InternalIODir}/TcpSocketEngine_unix_p.cpp - ) -endif ( _WIN32 ) +if( WIN32 ) + set( PlatformIOSources ${InternalIODir}/TcpSocketEngine_win_p.cpp ) +else() + set( PlatformIOSources ${InternalIODir}/TcpSocketEngine_unix_p.cpp ) +endif() #--------------------------- # make build-specific list #--------------------------- -set ( InternalIOSources - ${CommonIOSources} +set( InternalIOSources + ${CommonIOSources} ${PlatformIOSources} PARENT_SCOPE # <-- leave this last