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

diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index 66eb35f9f301478976acb9e24f02318a97fe07c6..a9dd0924a2925e7c661f71e6267b02489961b943 100644 (file)
--- 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_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
 
 # 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)
                        PREFIX "lib" )
 
 # link libraries automatically with zlib (and Winsock2, if applicable)

-if( _WIN32 )
+if( WIN32 )

     set( APILibs z ws2_32 )
     set( APILibs z ws2_32 )

-else( _WIN32 )
+else()

     set( APILibs z )
     set( APILibs z )

-endif( _WIN32 )
+endif()

 
 target_link_libraries( BamTools ${APILibs} )
 target_link_libraries( BamTools-static ${APILibs} )
 
 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 1c78cb9a5d840ae0f9c3c361b5587241d7d7577d..d6a7df6ef5492db05292d392b63ebe1778bd7be0 100644 (file)
--- a/src/api/internal/index/CMakeLists.txt
+++ b/src/api/internal/index/CMakeLists.txt
@@ -5,9 +5,9 @@
 # src/api/internal/index
 # ==========================
 
 # 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
         ${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 4b2bce2bea3b637a8623d33922eef3602859c1b0..2f303bd71a1034119ac23e74d9bc65c316945f38 100644 (file)
--- a/src/api/internal/sam/CMakeLists.txt
+++ b/src/api/internal/sam/CMakeLists.txt
@@ -5,9 +5,9 @@
 # src/api/internal/sam
 # ==========================
 
 # 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
         ${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 38a695709dc96b38cd11d1846ead82898afd29d5..d58f95c0437be47809fa400b658af059c3f33b37 100644 (file)
--- a/src/api/internal/utils/CMakeLists.txt
+++ b/src/api/internal/utils/CMakeLists.txt
@@ -5,9 +5,9 @@
 # src/api/internal/utils
 # ==========================
 
 # 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
         ${InternalUtilsDir}/BamException_p.cpp
 
         PARENT_SCOPE # <-- leave this last