Commit 727d4a2e authored by Jussi Lindgren's avatar Jussi Lindgren

Build: don't complain about boost -mt libs if regular ones are found

This makes the building on recent Linux distros less confusing.
parent 1e6e820f
......@@ -12,15 +12,15 @@ IF(UNIX)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Filesystem}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Filesystem} )
ELSE(LIB_Boost_Filesystem)
MESSAGE(STATUS " [FAILED] lib boost_Filesystem-mt")
# Fedora 20 and Ubuntu 13.10 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
# Fedora 20 and Ubuntu 13.10,14.04 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
FIND_LIBRARY(LIB_Boost_Filesystem NAMES "boost_filesystem" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Filesystem NAMES "boost_filesystem" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Filesystem)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Filesystem}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Filesystem})
ELSE(LIB_Boost_Filesystem)
MESSAGE(STATUS " [FAILED] lib boost_Filesystem")
MESSAGE(STATUS " [FAILED] lib boost_filesystem-mt")
MESSAGE(STATUS " [FAILED] lib boost_filesystem")
ENDIF(LIB_Boost_Filesystem)
ENDIF(LIB_Boost_Filesystem)
......
......@@ -13,15 +13,15 @@ IF(UNIX)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Regex}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Regex} )
ELSE(LIB_Boost_Regex)
MESSAGE(STATUS " [FAILED] lib boost_regex-mt")
# Fedora 20 and Ubuntu 13.10 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
# Fedora 20 and Ubuntu 13.10,14.04 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
FIND_LIBRARY(LIB_Boost_Regex NAMES "boost_regex" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Regex NAMES "boost_regex" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Regex)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Regex}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Regex})
ELSE(LIB_Boost_Regex)
MESSAGE(STATUS " [FAILED] lib boost_Regex")
MESSAGE(STATUS " [FAILED] lib boost_regex-mt")
MESSAGE(STATUS " [FAILED] lib boost_regex")
ENDIF(LIB_Boost_Regex)
ENDIF(LIB_Boost_Regex)
ENDIF(UNIX)
......
......@@ -13,15 +13,15 @@ IF(UNIX)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_System}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_System} )
ELSE(LIB_Boost_System)
MESSAGE(STATUS " [FAILED] lib boost_system-mt")
# Fedora 20 and Ubuntu 13.10 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
# Fedora 20 and Ubuntu 13.10,14.04 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
FIND_LIBRARY(LIB_Boost_System NAMES "boost_system" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_System NAMES "boost_system" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_System)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_System}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_System})
ELSE(LIB_Boost_System)
MESSAGE(STATUS " [FAILED] lib boost_System")
MESSAGE(STATUS " [FAILED] lib boost_system-mt")
MESSAGE(STATUS " [FAILED] lib boost_system")
ENDIF(LIB_Boost_System)
ENDIF(LIB_Boost_System)
ENDIF(UNIX)
......
......@@ -12,15 +12,15 @@ IF(UNIX)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Thread}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Thread} )
ELSE(LIB_Boost_Thread)
MESSAGE(STATUS " [FAILED] lib boost_thread-mt")
# Fedora 20 and Ubuntu 13.10 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
# Fedora 20 and Ubuntu 13.10,14.04 have no more multi-thread boost libs ( *-mt ) so try if there are non -mt libs to link
FIND_LIBRARY(LIB_Boost_Thread NAMES "boost_thread" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Thread NAMES "boost_thread" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Thread)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Thread}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Thread})
ELSE(LIB_Boost_Thread)
MESSAGE(STATUS " [FAILED] lib boost_Thread")
MESSAGE(STATUS " [FAILED] lib boost_thread-mt")
MESSAGE(STATUS " [FAILED] lib boost_thread")
ENDIF(LIB_Boost_Thread)
ENDIF(LIB_Boost_Thread)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment