diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index c3aec5530..a2a2d12e8 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -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}) diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py index 53b8a2eb6..b79a3e61d 100644 --- a/src/Tools/SubWCRev.py +++ b/src/Tools/SubWCRev.py @@ -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