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