Skip to content
Browse files

removed dependency of boost filesystem and serialization from setupbo…

…ost.cmake
  • Loading branch information...
1 parent 865eaa5 commit 5c6351f281aa0f2a863af24c1088a7d2388bfc0e Christian P. V. Christoffersen committed Mar 12, 2012
Showing with 63 additions and 63 deletions.
  1. +63 −63 conf/cmake/SetupBoost.cmake
View
126 conf/cmake/SetupBoost.cmake
@@ -1,74 +1,74 @@
SET(CMAKE_INCLUDE_PATH ${OE_LIB_DIR}/boost)
FIND_PACKAGE(Boost)
-IF (Boost_FOUND)
+# IF (Boost_FOUND)
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
- # Debug mode libraries
- IF(CMAKE_BUILD_TYPE MATCHES debug)
- FIND_LIBRARY(BOOST_FILESYSTEM_LIB NAMES
- boost_filesystem
- boost_filesystem-mt
- libboost_filesystem-vc80-mt-gd-1_33_1
- libboost_filesystem-vc80-mt-gd-1_34_1
- PATHS
- ${Boost_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}/lib
- )
- FIND_LIBRARY(BOOST_SERIALIZATION_LIB NAMES
- boost_serialization
- boost_serialization-mt
- libboost_serialization-vc80-mt-gd-1_33_1
- libboost_serialization-vc80-mt-gd-1_34_1
- PATHS
- ${Boost_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}/lib
- )
- # Boost 1.37, boost::system is required
- FIND_LIBRARY(BOOST_SYSTEM_LIB NAMES
- boost_system
- boost_system-mt
- )
- IF (BOOST_SYSTEM_LIB)
- SET(BOOST_SERIALIZATION_LIB ${BOOST_SERIALIZATION_LIB} ${BOOST_SYSTEM_LIB})
- ENDIF (BOOST_SYSTEM_LIB)
+# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+# # Debug mode libraries
+# IF(CMAKE_BUILD_TYPE MATCHES debug)
+# FIND_LIBRARY(BOOST_FILESYSTEM_LIB NAMES
+# boost_filesystem
+# boost_filesystem-mt
+# libboost_filesystem-vc80-mt-gd-1_33_1
+# libboost_filesystem-vc80-mt-gd-1_34_1
+# PATHS
+# ${Boost_INCLUDE_DIRS}
+# ${Boost_INCLUDE_DIRS}/lib
+# )
+# FIND_LIBRARY(BOOST_SERIALIZATION_LIB NAMES
+# boost_serialization
+# boost_serialization-mt
+# libboost_serialization-vc80-mt-gd-1_33_1
+# libboost_serialization-vc80-mt-gd-1_34_1
+# PATHS
+# ${Boost_INCLUDE_DIRS}
+# ${Boost_INCLUDE_DIRS}/lib
+# )
+# # Boost 1.37, boost::system is required
+# FIND_LIBRARY(BOOST_SYSTEM_LIB NAMES
+# boost_system
+# boost_system-mt
+# )
+# IF (BOOST_SYSTEM_LIB)
+# SET(BOOST_SERIALIZATION_LIB ${BOOST_SERIALIZATION_LIB} ${BOOST_SYSTEM_LIB})
+# ENDIF (BOOST_SYSTEM_LIB)
- # Release mode libraries
- ELSE(CMAKE_BUILD_TYPE MATCHES debug)
- FIND_LIBRARY(BOOST_FILESYSTEM_LIB NAMES
- boost_filesystem
- boost_filesystem-mt
- libboost_filesystem-vc80-mt-1_33_1
- libboost_filesystem-vc80-mt-1_34_1
- PATHS
- ${Boost_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}/lib
- )
- FIND_LIBRARY(BOOST_SERIALIZATION_LIB NAMES
- boost_serialization
- boost_serialization-mt
- libboost_serialization-vc80-mt-1_33_1
- libboost_serialization-vc80-mt-1_34_1
- PATHS
- ${Boost_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}/lib
- )
- # Boost 1.37, boost::system is required
- FIND_LIBRARY(BOOST_SYSTEM_LIB NAMES
- boost_system
- boost_system-mt
- )
- IF (BOOST_SYSTEM_LIB)
- SET(BOOST_SERIALIZATION_LIB ${BOOST_SERIALIZATION_LIB} ${BOOST_SYSTEM_LIB})
- ENDIF (BOOST_SYSTEM_LIB)
+# # Release mode libraries
+# ELSE(CMAKE_BUILD_TYPE MATCHES debug)
+# FIND_LIBRARY(BOOST_FILESYSTEM_LIB NAMES
+# boost_filesystem
+# boost_filesystem-mt
+# libboost_filesystem-vc80-mt-1_33_1
+# libboost_filesystem-vc80-mt-1_34_1
+# PATHS
+# ${Boost_INCLUDE_DIRS}
+# ${Boost_INCLUDE_DIRS}/lib
+# )
+# FIND_LIBRARY(BOOST_SERIALIZATION_LIB NAMES
+# boost_serialization
+# boost_serialization-mt
+# libboost_serialization-vc80-mt-1_33_1
+# libboost_serialization-vc80-mt-1_34_1
+# PATHS
+# ${Boost_INCLUDE_DIRS}
+# ${Boost_INCLUDE_DIRS}/lib
+# )
+# # Boost 1.37, boost::system is required
+# FIND_LIBRARY(BOOST_SYSTEM_LIB NAMES
+# boost_system
+# boost_system-mt
+# )
+# IF (BOOST_SYSTEM_LIB)
+# SET(BOOST_SERIALIZATION_LIB ${BOOST_SERIALIZATION_LIB} ${BOOST_SYSTEM_LIB})
+# ENDIF (BOOST_SYSTEM_LIB)
- ENDIF(CMAKE_BUILD_TYPE MATCHES debug)
+# ENDIF(CMAKE_BUILD_TYPE MATCHES debug)
- IF(NOT BOOST_FILESYSTEM_LIB OR NOT BOOST_SERIALIZATION_LIB)
- SET(Boost_FOUND 0)
- ENDIF(NOT BOOST_FILESYSTEM_LIB OR NOT BOOST_SERIALIZATION_LIB)
+# IF(NOT BOOST_FILESYSTEM_LIB OR NOT BOOST_SERIALIZATION_LIB)
+# SET(Boost_FOUND 0)
+# ENDIF(NOT BOOST_FILESYSTEM_LIB OR NOT BOOST_SERIALIZATION_LIB)
-ENDIF (Boost_FOUND)
+# ENDIF (Boost_FOUND)
IF (NOT Boost_FOUND)
MESSAGE ("WARNING: Could not find Boost - depending targets will be disabled.")

0 comments on commit 5c6351f

Please sign in to comment.
Something went wrong with that request. Please try again.