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

+ fixes #0001361: StartPage scripts and resources are installed twice

Browse Source
This commit is contained in:
wmayer 2014-12-01 15:57:23 +01:00
parent dd3412b159
commit 640c9cbf8b
3 changed files with 44 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Mod/Start/CMakeLists.txt
View File

@ -1,6 +1,41 @@
add_subdirectory(App) add_subdirectory(App)
if(BUILD_GUI) if(BUILD_GUI)
SET(StartPage_Scripts
StartPage.py
__init__.py
)
SET(StartPage_Resources
ArchDesign.py
DefaultWorkbench.py
LoadDrawingExample.py
LoadPartDesignExample.py
LoadRobotExample.py
LoadSchenkel.py
LoadMRU0.py
LoadMRU1.py
LoadMRU2.py
LoadArchExample.py
Mesh.py
PartDesign.py
Background.jpg
FreeCAD.png
PartDesign.png
ArchDesign.png
Mesh.png
Complete.png
PartDesignExample.png
ArchExample.png
web.png
blank.png
freecad-doc.png
complete.jpg
Ship.py
Ship.png
ShipExample.png
)
add_subdirectory(Gui) add_subdirectory(Gui)
add_subdirectory(StartPage) add_subdirectory(StartPage)
endif(BUILD_GUI) endif(BUILD_GUI)

44
src/Mod/Start/Gui/CMakeLists.txt
View File

@ -26,52 +26,22 @@ SET(StartGui_SRCS
Workbench.h Workbench.h
) )
SET(StartPage_Scripts
InitGui.py
StartPage/StartPage.py
StartPage/__init__.py
)
SET(StartPage_Resources
StartPage/PartDesign.py
StartPage/ArchDesign.py
StartPage/DefaultWorkbench.py
StartPage/Mesh.py
StartPage/LoadSchenkel.py
StartPage/LoadPartDesignExample.py
StartPage/LoadDrawingExample.py
StartPage/LoadRobotExample.py
StartPage/LoadArchExample.py
StartPage/Background.jpg
StartPage/FreeCAD.png
StartPage/ArchDesign.png
StartPage/PartDesign.png
StartPage/Mesh.png
StartPage/Complete.png
StartPage/LoadMRU0.py
StartPage/LoadMRU1.py
StartPage/LoadMRU2.py
StartPage/PartDesignExample.png
StartPage/ArchExample.png
StartPage/web.png
StartPage/blank.png
StartPage/complete.jpg
StartPage/Ship.py
StartPage/Ship.png
StartPage/ShipExample.png
)
add_library(StartGui SHARED ${StartGui_SRCS}) add_library(StartGui SHARED ${StartGui_SRCS})
target_link_libraries(StartGui ${StartGui_LIBS}) target_link_libraries(StartGui ${StartGui_LIBS})
fc_target_copy_resource(StartGui fc_target_copy_resource(StartGui
${CMAKE_SOURCE_DIR}/src/Mod/Start ${CMAKE_SOURCE_DIR}/src/Mod/Start
${CMAKE_BINARY_DIR}/Mod/Start ${CMAKE_BINARY_DIR}/Mod/Start
InitGui.py)
fc_target_copy_resource(StartGui
${CMAKE_SOURCE_DIR}/src/Mod/Start/StartPage
${CMAKE_BINARY_DIR}/Mod/Start/StartPage
${StartPage_Scripts}) ${StartPage_Scripts})
fc_target_copy_resource(StartGui fc_target_copy_resource(StartGui
${CMAKE_SOURCE_DIR}/src/Mod/Start ${CMAKE_SOURCE_DIR}/src/Mod/Start/StartPage
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage
${StartPage_Resources}) ${StartPage_Resources})
SET_BIN_DIR(StartGui StartGui /Mod/Start) SET_BIN_DIR(StartGui StartGui /Mod/Start)

39
src/Mod/Start/StartPage/CMakeLists.txt
View File

@ -1,43 +1,8 @@
SET(StartPage_SRCS
StartPage.py
__init__.py
)
SET(StartPage_DATA INSTALL(FILES ${StartPage_Scripts}
ArchDesign.py
DefaultWorkbench.py
LoadDrawingExample.py
LoadPartDesignExample.py
LoadRobotExample.py
LoadSchenkel.py
LoadMRU0.py
LoadMRU1.py
LoadMRU2.py
LoadArchExample.py
Mesh.py
PartDesign.py
Background.jpg
FreeCAD.png
PartDesign.png
ArchDesign.png
Mesh.png
Complete.png
PartDesignExample.png
ArchExample.png
web.png
blank.png
freecad-doc.png
complete.jpg
Ship.py
Ship.png
ShipExample.png
)
INSTALL(FILES ${StartPage_SRCS}
DESTINATION Mod/Start/StartPage DESTINATION Mod/Start/StartPage
) )
INSTALL(FILES ${StartPage_DATA} INSTALL(FILES ${StartPage_Resources}
DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage
) )