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

Merge pull request #186 from cpu82/master 

FreeBSD fixes and improvements
pull/169/merge
Vitaliy Filippov 2018-07-23 02:40:23 +03:00 committed by GitHub
parent 8384f0c983 b06f66c86d
commit ad9b66a92c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grive/CMakeLists.txt
View File

@ -26,8 +26,8 @@ set_target_properties( grive_executable
install(TARGETS grive_executable RUNTIME DESTINATION bin)
if ( ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" )
if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" )
install(FILES doc/grive.1 DESTINATION man/man1 )
else ( ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" )
else ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" )
install(FILES doc/grive.1 DESTINATION share/man/man1 )
endif( ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" )
endif( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" )

4
libgrive/CMakeLists.txt
View File

@ -144,6 +144,10 @@ target_link_libraries( btest
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
)
if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing" )
endif ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
if ( WIN32 )
else ( WIN32 )
set_target_properties( btest

2
libgrive/src/util/File.cc
View File

@ -33,7 +33,7 @@
#include <sys/types.h>
#include <fcntl.h>
#ifdef __OpenBSD__
#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <unistd.h>
#endif