Fix a couple of dfsg issues, make git the default vcs
This commit is contained in:
parent
5b92ec13d4
commit
2828a91b7b
|
@ -108,7 +108,7 @@ SET(Robot_Scripts
|
|||
RobotExampleTrajectoryOutOfShapes.py
|
||||
)
|
||||
|
||||
if (EXISTS Lib/Kuka)
|
||||
if (EXISTS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/Lib/Kuka)
|
||||
SET(Robot_Resources
|
||||
Lib/Kuka/kr500_1.wrl
|
||||
Lib/Kuka/kr500_1.csv
|
||||
|
@ -123,7 +123,7 @@ SET(Robot_Resources
|
|||
Lib/Kuka/kr_125.csv
|
||||
Lib/Kuka/kr125_2.pdf
|
||||
)
|
||||
endif (EXISTS Lib/Kuka)
|
||||
endif ()
|
||||
|
||||
add_library(Robot SHARED ${Robot_SRCS})
|
||||
target_link_libraries(Robot ${Robot_LIBS})
|
||||
|
|
|
@ -250,7 +250,7 @@ def main():
|
|||
if o in ("-b", "--bindir"):
|
||||
bindir = a
|
||||
|
||||
vcs=[Subversion(), BazaarControl(), GitControl(), MercurialControl(), DebianChangelog(), UnknownControl()]
|
||||
vcs=[GitControl(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]
|
||||
for i in vcs:
|
||||
if i.extractInfo(srcdir):
|
||||
# Open the template file and the version file
|
||||
|
|
Loading…
Reference in New Issue
Block a user