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

Draft: fixed cmake and installer stuff with removed draftlibs

Browse Source
This commit is contained in:
Yorik van Havre 2013-06-23 15:33:26 -03:00
parent 2d180fac38
commit 218a828327
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Draft/CMakeLists.txt
View File

@ -20,16 +20,7 @@ SET(Draft_SRCS
)
SOURCE_GROUP("" FILES ${Draft_SRCS})
SET(DraftLibs_SRCS
draftlibs/dxfColorMap.py
draftlibs/dxfImportObjects.py
draftlibs/dxfLibrary.py
draftlibs/dxfReader.py
draftlibs/__init__.py
)
SOURCE_GROUP("draftlibs" FILES ${DraftLibs_SRCS})
SET(all_files ${Draft_SRCS} ${DraftLibs_SRCS})
SET(all_files ${Draft_SRCS})
ADD_CUSTOM_TARGET(Draft ALL
SOURCES ${all_files}
@ -37,13 +28,6 @@ ADD_CUSTOM_TARGET(Draft ALL
fc_copy_sources(Draft "${CMAKE_BINARY_DIR}/Mod/Draft" ${all_files})
INSTALL(
FILES
${DraftLibs_SRCS}
DESTINATION
Mod/Draft/draftlibs
)
INSTALL(
FILES
${Draft_SRCS}

9
src/WindowsInstaller/ModDraft.wxi
View File

@ -42,14 +42,5 @@
<File Id="DraftGeomUtilsPy" Name="DraftGeomUtils.py" DiskId="1" />
<File Id="importDWGPy" Name="importDWG.py" DiskId="1" />
</Component>
<Directory Id="ModDraftLib" Name="draftlibs" FileSource="../../Mod/Draft/draftlibs">
<Component Id="CompModDraftLib" Guid="d19c08b0-0747-11de-8c30-0800200c9a66" Win64='$(var.Win_64)' KeyPath="yes">
<File Id="DraftLibInitPy" Name="__init__.py" DiskId="1" />
<File Id="DraftLibColorMapPy" Name="dxfColorMap.py" DiskId="1" />
<File Id="DraftLibdxfImportObjectsPy" Name="dxfImportObjects.py" DiskId="1" />
<File Id="DraftLibdxfLibraryPy" Name="dxfLibrary.py" DiskId="1" />
<File Id="DraftLibdxfReaderPy" Name="dxfReader.py" DiskId="1" />
</Component>
</Directory>
</Directory>
</Include>