vitalif
/
grive2
mirror of https://github.com/vitalif/grive2
1
0
Fork 0
Code Issues Releases Wiki Activity

Link against specific Boost libraries, avoid using Boost_LIBRARIES 

grive should not be linked against the Boost unit test framework, only
btest needs it.

Don't specify Boost libraries for executables if libgrive uses those
libraries. CMake takes care of the dependencies.
pull/180/head
Pavel Roskin 2018-01-02 18:07:45 -08:00
parent 84c57c121e
commit 8f2f217da6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grive/CMakeLists.txt
View File

@ -17,7 +17,6 @@ add_executable( grive_executable
) )
target_link_libraries( grive_executable target_link_libraries( grive_executable
${Boost_LIBRARIES}
grive grive
) )

8
libgrive/CMakeLists.txt
View File

@ -83,7 +83,10 @@ target_link_libraries( grive
${YAJL_LIBRARIES} ${YAJL_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${LIBGCRYPT_LIBRARIES} ${LIBGCRYPT_LIBRARIES}
${Boost_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${IBERTY_LIBRARY} ${IBERTY_LIBRARY}
${EXPAT_LIBRARY} ${EXPAT_LIBRARY}
${OPT_LIBS} ${OPT_LIBS}
@ -126,7 +129,6 @@ IF ( CPPUNIT_FOUND )
target_link_libraries( unittest target_link_libraries( unittest
grive grive
${CPPUNIT_LIBRARY} ${CPPUNIT_LIBRARY}
${Boost_LIBRARIES}
) )
ENDIF ( CPPUNIT_FOUND ) ENDIF ( CPPUNIT_FOUND )
@ -139,7 +141,7 @@ add_executable( btest ${BTEST_SRC} )
target_link_libraries( btest target_link_libraries( btest
grive grive
${Boost_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
) )
if ( WIN32 ) if ( WIN32 )