build fixes

cmake/boost.cmake

@@ -39,7 +39,7 @@ set (BOOST_COMMON_ARGS
 )
 
 if (MINGW)
-  if (NOT WIN32)
+  if (NOT CMAKE_HOST_WIN32)
     set(BOOST_COMMON_ARGS 
       ${BOOST_COMMON_ARGS}
       --user-config=./user-config.jam
@@ -77,7 +77,7 @@ if (MINGW)
   set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION})
   string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_VERSION})
   list(GET BOOST_GCC_VERSION_LIST 0 BOOST_GCC_MAJOR_VERSION)
-  if(WIN32)
+  if (CMAKE_HOST_WIN32)
     set(BOOST_LIB_EXTRA "-mgw${BOOST_GCC_MAJOR_VERSION}-mt${DEBUG_EXTRA2}-x64-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}")
   endif()
 endif()
@@ -95,6 +95,6 @@ set(Boost_LIBRARIES
 )
 
 add_dependencies(boost_project zlib_project)
-if (WIN32)
+if (CMAKE_HOST_WIN32)
   include_directories(SYSTEM ${EXTERNAL_BUILD_ROOT}/include/boost-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION})
 endif()