Skip to content

Commit

Permalink
renamed: Util/finger_print.* -> Util/fingerprint.*
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisOSRM committed Jan 13, 2015
1 parent 67f3111 commit ef9074f
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Thumbs.db
# build related files #
#######################
/build/
/Util/finger_print.cpp
/Util/fingerprint.cpp
/Util/git_sha.cpp
/cmake/postinst

Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ OPTION(BUILD_TOOLS "Build OSRM tools" OFF)
include_directories(${CMAKE_SOURCE_DIR}/Include/)
include_directories(${CMAKE_SOURCE_DIR}/third_party/)

add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp finger_print.cpp.alwaysbuild
add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/fingerprint.cpp fingerprint.cpp.alwaysbuild
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake
DEPENDS
${CMAKE_SOURCE_DIR}/Util/finger_print.cpp.in
COMMENT "Configuring finger_print.cpp"
${CMAKE_SOURCE_DIR}/Util/fingerprint.cpp.in
COMMENT "Configuring fingerprint.cpp"
VERBATIM)

add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp)
add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/fingerprint.cpp)
add_custom_target(tests DEPENDS datastructure-tests algorithm-tests)
add_custom_target(benchmarks DEPENDS rtree-bench)

Expand Down Expand Up @@ -88,7 +88,7 @@ set(
${HttpGlob}
)
add_library(COORDINATE OBJECT ${CoordinateGlob})
add_library(FINGERPRINT OBJECT Util/finger_print.cpp)
add_library(FINGERPRINT OBJECT Util/fingerprint.cpp)
add_library(GITDESCRIPTION OBJECT Util/git_sha.cpp)
add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION>)
add_dependencies(FINGERPRINT FingerPrintConfigure)
Expand Down
2 changes: 1 addition & 1 deletion Util/finger_print.cpp.in → Util/fingerprint.cpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*/

#include "finger_print.hpp"
#include "fingerprint.hpp"

#include "osrm_exception.hpp"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Util/graph_loader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../data_structures/import_edge.hpp"
#include "../data_structures/query_node.hpp"
#include "../data_structures/restriction.hpp"
#include "../Util/fingerprint.hpp"
#include "../Util/simple_logger.hpp"
#include "../Util/finger_print.hpp"
#include "../typedefs.h"

#include <boost/assert.hpp>
Expand Down
4 changes: 2 additions & 2 deletions cmake/FingerPrint-Config.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(OLDFILE ${SOURCE_DIR}/Util/FingerPrint.cpp)
set(OLDFILE ${SOURCE_DIR}/Util/fingerprint.cpp)
if (EXISTS ${OLDFILE})
file(REMOVE_RECURSE ${OLDFILE})
endif()
Expand All @@ -7,4 +7,4 @@ file(MD5 ${SOURCE_DIR}/data_structures/static_rtree.hpp MD5RTREE)
file(MD5 ${SOURCE_DIR}/Util/graph_loader.hpp MD5GRAPH)
file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS)

CONFIGURE_FILE( ${SOURCE_DIR}/Util/finger_print.cpp.in ${SOURCE_DIR}/Util/finger_print.cpp )
CONFIGURE_FILE( ${SOURCE_DIR}/Util/fingerprint.cpp.in ${SOURCE_DIR}/Util/fingerprint.cpp )
2 changes: 1 addition & 1 deletion datastore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "Util/DataStoreOptions.h"
#include "Util/simple_logger.hpp"
#include "Util/osrm_exception.hpp"
#include "Util/finger_print.hpp"
#include "Util/fingerprint.hpp"
#include "typedefs.h"

#include <osrm/coordinate.hpp>
Expand Down
2 changes: 1 addition & 1 deletion extractor/extraction_containers.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "first_and_last_segment_of_way.hpp"
#include "../data_structures/external_memory_node.hpp"
#include "../data_structures/restriction.hpp"
#include "../Util/finger_print.hpp"
#include "../Util/fingerprint.hpp"

#include <stxxl/vector>

Expand Down
2 changes: 1 addition & 1 deletion tools/components.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../typedefs.h"
#include "../algorithms/tiny_components.hpp"
#include "../data_structures/dynamic_graph.hpp"
#include "../Util/fingerprint.hpp"
#include "../Util/graph_loader.hpp"
#include "../Util/make_unique.hpp"
#include "../Util/osrm_exception.hpp"
#include "../Util/simple_logger.hpp"
#include "../Util/finger_print.hpp"

#include <boost/filesystem.hpp>

Expand Down

0 comments on commit ef9074f

Please sign in to comment.