From: Derek Barnett <derekwbarnett@gmail.com>
Date: Wed, 24 Jul 2013 18:50:30 +0000 (-0400)
Subject: Related to last commit - fixed another instance of '_WIN32'
X-Git-Url: https://git.donarmstrong.com/?p=bamtools.git;a=commitdiff_plain;h=71065ecaf5951e21ca202138e7013fce5d634b88

Related to last commit - fixed another instance of '_WIN32'
---

diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index 66eb35f..a9dd092 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions( -DBAMTOOLS_API_LIBRARY ) # (for proper exporting of library sym
 add_definitions( -fPIC ) # (attempt to force PIC compiling on CentOS, not being set on shared libs by CMake)
 
 # fetch all internal source files
-add_subdirectory ( internal )
+add_subdirectory( internal )
 
 # make list of all API source files
 set( BamToolsAPISources
@@ -44,11 +44,11 @@ set_target_properties( BamTools-static PROPERTIES
                        PREFIX "lib" )
 
 # link libraries automatically with zlib (and Winsock2, if applicable)
-if( _WIN32 )
+if( WIN32 )
     set( APILibs z ws2_32 )
-else( _WIN32 )
+else()
     set( APILibs z )
-endif( _WIN32 )
+endif()
 
 target_link_libraries( BamTools ${APILibs} )
 target_link_libraries( BamTools-static ${APILibs} )
diff --git a/src/api/internal/index/CMakeLists.txt b/src/api/internal/index/CMakeLists.txt
index 1c78cb9..d6a7df6 100644
--- a/src/api/internal/index/CMakeLists.txt
+++ b/src/api/internal/index/CMakeLists.txt
@@ -5,9 +5,9 @@
 # src/api/internal/index
 # ==========================
 
-set ( InternalIndexDir "${InternalDir}/index" )
+set( InternalIndexDir "${InternalDir}/index" )
 
-set ( InternalIndexSources
+set( InternalIndexSources
         ${InternalIndexDir}/BamIndexFactory_p.cpp
         ${InternalIndexDir}/BamStandardIndex_p.cpp
         ${InternalIndexDir}/BamToolsIndex_p.cpp
diff --git a/src/api/internal/sam/CMakeLists.txt b/src/api/internal/sam/CMakeLists.txt
index 4b2bce2..2f303bd 100644
--- a/src/api/internal/sam/CMakeLists.txt
+++ b/src/api/internal/sam/CMakeLists.txt
@@ -5,9 +5,9 @@
 # src/api/internal/sam
 # ==========================
 
-set ( InternalSamDir "${InternalDir}/sam" )
+set( InternalSamDir "${InternalDir}/sam" )
 
-set ( InternalSamSources
+set( InternalSamSources
         ${InternalSamDir}/SamFormatParser_p.cpp
         ${InternalSamDir}/SamFormatPrinter_p.cpp
         ${InternalSamDir}/SamHeaderValidator_p.cpp
diff --git a/src/api/internal/utils/CMakeLists.txt b/src/api/internal/utils/CMakeLists.txt
index 38a6957..d58f95c 100644
--- a/src/api/internal/utils/CMakeLists.txt
+++ b/src/api/internal/utils/CMakeLists.txt
@@ -5,9 +5,9 @@
 # src/api/internal/utils
 # ==========================
 
-set ( InternalUtilsDir "${InternalDir}/utils" )
+set( InternalUtilsDir "${InternalDir}/utils" )
 
-set ( InternalUtilsSources
+se( InternalUtilsSources
         ${InternalUtilsDir}/BamException_p.cpp
 
         PARENT_SCOPE # <-- leave this last