Skip to content

Pr update to new rtrlib api #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waehlisch merged 5 commits into from
Jun 21, 2016
Merged

Pr update to new rtrlib api #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c77814
add cmake modules to find deps
smlng Jun 20, 2016
0e5a994
update to new rtrlib api
smlng Jun 20, 2016
e732abc
fix cmake: if OSX search for argp
smlng Jun 20, 2016
ad579c6
remove explicit libssh dependency
smlng Jun 20, 2016
8e13275
fix input params for rtr_mgr_init
smlng Jun 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix cmake: if OSX search for argp
  • Loading branch information
@smlng
smlng committed Jun 20, 2016
commit e732abc9d134d73d52732fad8052de46cc07339f
15 changes: 10 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99")

include_directories(.)
find_package(Argp)
if(ARGP_FOUND)
message(STATUS "argp found.")
if(APPLE)
find_package(Argp)
if(ARGP_FOUND)
message(STATUS "argp found.")
else()
message(FATAL_ERROR "argp not found!")
endif(ARGP_FOUND)
else()
message(FATAL_ERROR "argp not found!")
endif(ARGP_FOUND)
set(ARGP_INCLUDE_DIRS "")
set(ARGP_LIBRARIES "")
endif(APPLE)

if(NOT RTRLIB_INCLUDE AND NOT RTRLIB_LIBRARY)
find_package(Rtr)
Expand Down
2 changes: 1 addition & 1 deletion bird-rtrlib-cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with BIRD-RTRlib-CLI; see the file COPYING.
*
* written by Mehmet Ceyran, in cooperation with:
* written by smlng and Mehmet Ceyran, in cooperation with:
* CST group, Freie Universitaet Berlin
* Website: https://github.com/rtrlib/bird-rtrlib-cli
*/
Expand Down
2 changes: 1 addition & 1 deletion bird.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with BIRD-RTRlib-CLI; see the file COPYING.
*
* written by Mehmet Ceyran, in cooperation with:
* written by smlng and Mehmet Ceyran, in cooperation with:
* CST group, Freie Universitaet Berlin
* Website: https://github.com/rtrlib/bird-rtrlib-cli
*/
Expand Down