From 5b92ec13d49c9a11b83b8dd306e892ca6960a90e Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 21 Jun 2012 12:09:52 +0200 Subject: [PATCH] Fix a couple of dfsg issues --- CMakeLists.txt | 4 +++- src/Mod/Idf/CMakeLists.txt | 1 + src/Mod/Robot/App/CMakeLists.txt | 2 ++ src/Tools/makedist.py | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f44c39c25..602f37de4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -353,7 +353,9 @@ endif(FREECAD_LIBPACK_USE) # copy build convenient files for M$ if(WIN32) - configure_file(BuildAll.bat ${CMAKE_BINARY_DIR}/BuildAll.bat COPYONLY) + if (EXISTS BuildAll.bat) + configure_file(BuildAll.bat ${CMAKE_BINARY_DIR}/BuildAll.bat COPYONLY) + endif (EXISTS BuildAll.bat) #configure_file(BuildAllNice.bat ${CMAKE_BINARY_DIR}/BuildAllNice.bat COPYONLY) endif(WIN32) diff --git a/src/Mod/Idf/CMakeLists.txt b/src/Mod/Idf/CMakeLists.txt index d27534127..ff8d895e2 100644 --- a/src/Mod/Idf/CMakeLists.txt +++ b/src/Mod/Idf/CMakeLists.txt @@ -6,6 +6,7 @@ SET(Idf_SRCS SOURCE_GROUP("" FILES ${Idf_SRCS}) SET(IdfLibs_SRCS + lib/License.txt lib/0603_SMD.stp lib/0805_SMD.stp lib/1206_SMD.stp diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index 6af950f3c..c3aec5530 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -108,6 +108,7 @@ SET(Robot_Scripts RobotExampleTrajectoryOutOfShapes.py ) +if (EXISTS Lib/Kuka) SET(Robot_Resources Lib/Kuka/kr500_1.wrl Lib/Kuka/kr500_1.csv @@ -122,6 +123,7 @@ SET(Robot_Resources Lib/Kuka/kr_125.csv Lib/Kuka/kr125_2.pdf ) +endif (EXISTS Lib/Kuka) add_library(Robot SHARED ${Robot_SRCS}) target_link_libraries(Robot ${Robot_LIBS}) diff --git a/src/Tools/makedist.py b/src/Tools/makedist.py index a30550e2c..e42c69a33 100644 --- a/src/Tools/makedist.py +++ b/src/Tools/makedist.py @@ -34,6 +34,7 @@ def main(): gitattr.write("zipios++ export-ignore\n") gitattr.write("Pivy-0.5 export-ignore\n") gitattr.write("Pivy export-ignore\n") + gitattr.write("Kuka export-ignore\n") gitattr.close() # revision number