Commit 2eceab0a authored by thillux's avatar thillux
Browse files

updated copyright and included boost log

parent 69826b66

src/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ add_executable(topoGen ${topoSources}) 
# LINKER OPTIONS

#



find_package(Boost REQUIRED COMPONENTS program_options system thread)

find_package(Boost REQUIRED COMPONENTS log log_setup program_options system thread)

include_directories(${Boost_INCLUDE_DIRS})

link_directories(${Boost_LIBRARY_DIRS})

target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})

add_definitions(-DBOOST_LOG_DYN_LINK)



find_package(CGAL REQUIRED)

include_directories(${CGAL_INCLUDE_DIR})

src/config/CMDArgs.cpp

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, Michael Grey and Markus Theil

 * Copyright (c) 2013-2015, Michael Grey and Markus Theil

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

src/config/CMDArgs.hpp

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, Michael Grey and Markus Theil

 * Copyright (c) 2013-2015, Michael Grey and Markus Theil

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

src/config/Config.cpp

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, Michael Grey and Markus Theil

 * Copyright (c) 2013-2015, Michael Grey and Markus Theil

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

src/config/Config.hpp

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, Michael Grey and Markus Theil

 * Copyright (c) 2013-2015, Michael Grey and Markus Theil

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,8 @@ class Config { 


    Config_Ptr subConfig(std::string propertyName);



    template <class T> T get(std::string);

    template <class T>

    T get(std::string);



   protected:

    Config(Json::Value node);