libtransport.git Changeset - 898b05c61506

Changeset - 898b05c61506

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Vitaly Takmazov - 9 years ago 2017-01-20 08:48:50
vitalyster@gmail.com

CMake: do not find -mt prefixed boost

1 file changed with 2 insertions and 13 deletions:

CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -75,38 +75,27 @@ if(NOT SWIFTEN_FOUND) @@
 	set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Secur32")
 	set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Iphlpapi")
 	set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Winscard")
 	message(STATUS "XXXUsing swiften: ${SWIFTEN_INCLUDE_DIR} ${SWIFTEN_LIBRARY}
 	Version: ${SWIFTEN_VERSION}")
 endif()
 # FIND BOOST
 if (WIN32)
 	set(Boost_USE_STATIC_LIBS      ON)
 	set(Boost_USE_MULTITHREADED      ON)
 	set(Boost_USE_STATIC_RUNTIME    OFF)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals locale REQUIRED)
 else(WIN32)
 	LIST_CONTAINS(contains -lboost_program_options ${SWIFTEN_LIBRARY})
 	if(contains)
 		message(STATUS "Using non-multithreaded boost")
 		set(Boost_USE_MULTITHREADED 0)
 	endif(contains)
 	set(Boost_FIND_QUIETLY ON)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread-mt signals locale)
 	if (NOT Boost_FOUND)
 		set(Boost_FIND_QUIETLY OFF)
 		find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals locale REQUIRED)
 	endif()
 endif(WIN32)
 	set(Boost_FIND_QUIETLY ON)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals locale REQUIRED)
 message( STATUS "Found Boost: ${Boost_VERSION}, ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 if (${Boost_VERSION} GREATER 104999)
 	message( STATUS "Using BOOST_FILESYSTEM_VERSION=3")
 	add_definitions(-DBOOST_FILESYSTEM_VERSION=3)
 endif()
 # FIND POPT
 if (NOT WIN32)
 	set(popt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(popt REQUIRED)

0 comments (0 inline, 0 general)