suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a couple of dfsg issues, make git the default vcs

Browse Source
This commit is contained in:
wmayer 2012-06-21 12:25:53 +02:00
parent 5b92ec13d4
commit 2828a91b7b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Robot/App/CMakeLists.txt
View File

@ -108,7 +108,7 @@ SET(Robot_Scripts
RobotExampleTrajectoryOutOfShapes.py RobotExampleTrajectoryOutOfShapes.py
) )
if (EXISTS Lib/Kuka) if (EXISTS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/Lib/Kuka)
SET(Robot_Resources SET(Robot_Resources
Lib/Kuka/kr500_1.wrl Lib/Kuka/kr500_1.wrl
Lib/Kuka/kr500_1.csv Lib/Kuka/kr500_1.csv
@ -123,7 +123,7 @@ SET(Robot_Resources
Lib/Kuka/kr_125.csv Lib/Kuka/kr_125.csv
Lib/Kuka/kr125_2.pdf Lib/Kuka/kr125_2.pdf
) )
endif (EXISTS Lib/Kuka) endif ()
add_library(Robot SHARED ${Robot_SRCS}) add_library(Robot SHARED ${Robot_SRCS})
target_link_libraries(Robot ${Robot_LIBS}) target_link_libraries(Robot ${Robot_LIBS})

2
src/Tools/SubWCRev.py
View File

@ -250,7 +250,7 @@ def main():
if o in ("-b", "--bindir"): if o in ("-b", "--bindir"):
bindir = a bindir = a
vcs=[Subversion(), BazaarControl(), GitControl(), MercurialControl(), DebianChangelog(), UnknownControl()] vcs=[GitControl(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]
for i in vcs: for i in vcs:
if i.extractInfo(srcdir): if i.extractInfo(srcdir):
# Open the template file and the version file # Open the template file and the version file