[Positioner] Get rid of the src/ subdirectory
The src/ subdirectory is not needed any more, since we can build out of tree with CMake.
This commit is contained in:
Matteo Cypriani
parent
61aa4af3a3
commit
b97085d79f
|
|
@ -31,56 +31,56 @@ endif()
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||||
|
|
||||||
set(OWLPS_POSITIONER_SRC_FILES
|
set(OWLPS_POSITIONER_SRC_FILES
|
||||||
src/accesspoint.cc
|
accesspoint.cc
|
||||||
src/accesspointsreadercsv.cc
|
accesspointsreadercsv.cc
|
||||||
src/area.cc
|
area.cc
|
||||||
src/autocalibration.cc
|
autocalibration.cc
|
||||||
src/building.cc
|
building.cc
|
||||||
src/calibrationrequest.cc
|
calibrationrequest.cc
|
||||||
src/cartographyalgorithm.cc
|
cartographyalgorithm.cc
|
||||||
src/configuration.cc
|
configuration.cc
|
||||||
src/csvfilereader.cc
|
csvfilereader.cc
|
||||||
src/csvstringreader.cc
|
csvstringreader.cc
|
||||||
src/direction.cc
|
direction.cc
|
||||||
src/fbcm.cc
|
fbcm.cc
|
||||||
src/frbhmbasic.cc
|
frbhmbasic.cc
|
||||||
src/input.cc
|
input.cc
|
||||||
src/inputcsv.cc
|
inputcsv.cc
|
||||||
src/inputdatareader.cc
|
inputdatareader.cc
|
||||||
src/inputlogcsv.cc
|
inputlogcsv.cc
|
||||||
src/inputmedium.cc
|
inputmedium.cc
|
||||||
src/inputudpsocket.cc
|
inputudpsocket.cc
|
||||||
src/interlinknetworks.cc
|
interlinknetworks.cc
|
||||||
src/measurement.cc
|
measurement.cc
|
||||||
src/minmax.cc
|
minmax.cc
|
||||||
src/mobile.cc
|
mobile.cc
|
||||||
src/mobilesreadercsv.cc
|
mobilesreadercsv.cc
|
||||||
src/nss.cc
|
nss.cc
|
||||||
src/output.cc
|
output.cc
|
||||||
src/outputcsv.cc
|
outputcsv.cc
|
||||||
src/outputnetworksocket.cc
|
outputnetworksocket.cc
|
||||||
src/outputtcpsocketevaal.cc
|
outputtcpsocketevaal.cc
|
||||||
src/outputterminal.cc
|
outputterminal.cc
|
||||||
src/outputudpsocket.cc
|
outputudpsocket.cc
|
||||||
src/owlps-positionerd.cc
|
owlps-positionerd.cc
|
||||||
src/point3d.cc
|
point3d.cc
|
||||||
src/posexcept.cc
|
posexcept.cc
|
||||||
src/positioning.cc
|
positioning.cc
|
||||||
src/posutil.cc
|
posutil.cc
|
||||||
src/realposition.cc
|
realposition.cc
|
||||||
src/referencepoint.cc
|
referencepoint.cc
|
||||||
src/request.cc
|
request.cc
|
||||||
src/result.cc
|
result.cc
|
||||||
src/resultlist.cc
|
resultlist.cc
|
||||||
src/stock.cc
|
stock.cc
|
||||||
src/textfilereader.cc
|
textfilereader.cc
|
||||||
src/textfilewriter.cc
|
textfilewriter.cc
|
||||||
src/timestamp.cc
|
timestamp.cc
|
||||||
src/topologyreadercsv.cc
|
topologyreadercsv.cc
|
||||||
src/trilaterationalgorithm.cc
|
trilaterationalgorithm.cc
|
||||||
src/userinterface.cc
|
userinterface.cc
|
||||||
src/waypoint.cc
|
waypoint.cc
|
||||||
src/wifidevice.cc
|
wifidevice.cc
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(owlps-positionerd
|
add_executable(owlps-positionerd
|
||||||
|
|
@ -125,7 +125,7 @@ set_target_properties(
|
||||||
# Indentation
|
# Indentation
|
||||||
set(INDENTER astyle --style=gnu --indent=spaces=2 --formatted --recursive)
|
set(INDENTER astyle --style=gnu --indent=spaces=2 --formatted --recursive)
|
||||||
add_custom_target(indent_positioner
|
add_custom_target(indent_positioner
|
||||||
${INDENTER} src/*.cc src/*.hh
|
${INDENTER} *.cc *.hh
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||||
COMMENT "Reindenting source files"
|
COMMENT "Reindenting source files"
|
||||||
VERBATIM)
|
VERBATIM)
|
||||||
|
|
@ -133,7 +133,7 @@ add_custom_target(indent_positioner
|
||||||
# cppcheck
|
# cppcheck
|
||||||
set(CODE_CHECKER cppcheck --quiet --enable=all)
|
set(CODE_CHECKER cppcheck --quiet --enable=all)
|
||||||
add_custom_target(check_positioner
|
add_custom_target(check_positioner
|
||||||
${CODE_CHECKER} src/*.hh src/*.cc
|
${CODE_CHECKER} *.hh *.cc
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||||
COMMENT "Checking source code")
|
COMMENT "Checking source code")
|
||||||
|
|
||||||
|
|
@ -143,9 +143,11 @@ if (DOXYGEN_FOUND)
|
||||||
message(WARNING
|
message(WARNING
|
||||||
"Couldn't find Graphviz: you should install it if you want to generate diagrams in the OwlPS Positioner's HTML documentation")
|
"Couldn't find Graphviz: you should install it if you want to generate diagrams in the OwlPS Positioner's HTML documentation")
|
||||||
endif()
|
endif()
|
||||||
|
string(REPLACE " " "\ "
|
||||||
|
OWLPS_POSITIONER_SRC_FILES ${OWLPS_POSITIONER_SRC_FILES})
|
||||||
set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc")
|
set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc")
|
||||||
set(DOXYGEN
|
set(DOXYGEN
|
||||||
DOXYGEN_OUTPUT_DIRECTORY=${DOXYGEN_OUTPUT_DIRECTORY} OWLPS_VERSION=${OWLPS_VERSION} "${DOXYGEN_EXECUTABLE}")
|
DOXYGEN_INPUT=${DOXYGEN_INPUT} DOXYGEN_OUTPUT_DIRECTORY=${DOXYGEN_OUTPUT_DIRECTORY} OWLPS_VERSION=${OWLPS_VERSION} "${DOXYGEN_EXECUTABLE}")
|
||||||
set(DOXYFILE Doxyfile)
|
set(DOXYFILE Doxyfile)
|
||||||
add_custom_target(doc_positioner
|
add_custom_target(doc_positioner
|
||||||
${DOXYGEN} ${DOXYFILE}
|
${DOXYGEN} ${DOXYFILE}
|
||||||
|
|
|
||||||
|
|
@ -655,7 +655,7 @@ WARN_LOGFILE =
|
||||||
# directories like "/usr/src/myproject". Separate the files or directories
|
# directories like "/usr/src/myproject". Separate the files or directories
|
||||||
# with spaces.
|
# with spaces.
|
||||||
|
|
||||||
INPUT = src
|
INPUT = $(DOXYGEN_INPUT)
|
||||||
|
|
||||||
# This tag can be used to specify the character encoding of the source files
|
# This tag can be used to specify the character encoding of the source files
|
||||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
|
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue