Merge pull request #78 from Magisus/boost-link

MikaelSmith · web-flow · commit 7b000ec3bb47 · 2016-09-21T12:52:25.000-07:00
(maint) Fix linking errors when building with Leatherman locale
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ add_definitions(-DLEATHERMAN_I18N)
 include(leatherman)
 
 # Add other dependencies
-find_package(Boost 1.54 REQUIRED COMPONENTS thread date_time chrono system program_options)
+find_package(Boost 1.54 REQUIRED COMPONENTS locale thread date_time chrono system program_options)
 
 # pthreads if you require the Boost.Thread component.
 find_package(Threads)
diff --git a/lib/tests/CMakeLists.txt b/lib/tests/CMakeLists.txt
@@ -30,6 +30,10 @@ target_link_libraries(lib${PROJECT_NAME}_test
     ${CMAKE_THREAD_LIBS_INIT}
 )
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND BOOST_STATIC)
+    target_link_libraries(lib${PROJECT_NAME}_test iconv)
+endif()
+
 add_test(NAME "unit_tests" COMMAND lib${PROJECT_NAME}_test)
 
 configure_file (

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ target_link_libraries(lib${PROJECT_NAME}_test`
`30`	`30`	`${CMAKE_THREAD_LIBS_INIT}`
`31`	`31`	`)`
`32`	`32`
	`33`	`+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND BOOST_STATIC)`
	`34`	`+ target_link_libraries(lib${PROJECT_NAME}_test iconv)`
	`35`	`+endif()`
	`36`	`+`
`33`	`37`	`add_test(NAME "unit_tests" COMMAND lib${PROJECT_NAME}_test)`
`34`	`38`
`35`	`39`	`configure_file (`