From 77f1865209de7de71bf880d22f2ac3f8bce710d3 Mon Sep 17 00:00:00 2001 From: sbh Date: Mon, 17 Nov 2014 20:47:42 +0300 Subject: [PATCH] Boost has been removed from windows environment --- CMakeCommon/FindBoost.cmake | 36 ------------------------------------ msvc10_env.bat | 4 ++-- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 CMakeCommon/FindBoost.cmake diff --git a/CMakeCommon/FindBoost.cmake b/CMakeCommon/FindBoost.cmake deleted file mode 100644 index f44122086..000000000 --- a/CMakeCommon/FindBoost.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -#find_package(Boost) - -SET(BOOSTDIR $ENV{BOOST_ROOT_DIR}) -IF(WIN32) - INCLUDE_DIRECTORIES(${BOOSTDIR}/include/boost-1_52) -ELSE(WIN32) - INCLUDE_DIRECTORIES(${BOOSTDIR}/include) -ENDIF() - - -LINK_DIRECTORIES (${BOOSTDIR}/lib) - -#SET(BOOST_LIBRARIES ${BOOSTDIR}/lib/lib.lib) - -IF(WIN32) - SET(BOOST_DEFINITIONS -DBOOST_DISABLE_ASSERTS -DBOOST_ALL_DYN_LINK) -ENDIF() diff --git a/msvc10_env.bat b/msvc10_env.bat index fd95eec28..ee0c3adc7 100644 --- a/msvc10_env.bat +++ b/msvc10_env.bat @@ -116,8 +116,8 @@ set PATH=%CMAKEDIR%\bin;%PATH% @REM ------------------------- @REM BOOST -@SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0 -@SET PATH=%BOOST_ROOT_DIR%\lib;%PATH% +@REM @SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0 +@REM @SET PATH=%BOOST_ROOT_DIR%\lib;%PATH% @REM ------------------------- @REM ------------------------- -- 2.39.2