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

Fix Template module

Browse Source
This commit is contained in:
wmayer 2012-04-07 16:27:22 +02:00
parent 0de89f6ca3
commit ef7c1d4b50
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -96,6 +96,7 @@ OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3
OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
OPTION(FREECAD_BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
# ==============================================================================

4
src/CMakeLists.txt
View File

@ -12,6 +12,10 @@ if(FREECAD_BUILD_GUI)
configure_file(Doc/freecad.qch ${CMAKE_BINARY_DIR}/doc/freecad.qch COPYONLY)
endif(FREECAD_BUILD_GUI)
if(FREECAD_BUILD_TEMPLATE)
add_subdirectory(Tools/_TEMPLATE_)
endif(FREECAD_BUILD_TEMPLATE)
if(FREECAD_MAINTAINERS_BUILD)
add_subdirectory(Doc)
endif(FREECAD_MAINTAINERS_BUILD)

8
src/Tools/_TEMPLATE_/App/CMakeLists.txt
View File

@ -20,7 +20,12 @@ SET(_TEMPLATE__SRCS
add_library(_TEMPLATE_ SHARED ${_TEMPLATE__SRCS})
target_link_libraries(_TEMPLATE_ ${_TEMPLATE__LIBS})
fc_copy_script("Mod/_TEMPLATE_" "_TEMPLATE_" Init.py)
fc_target_copy_resource(_TEMPLATE_
${CMAKE_SOURCE_DIR}/src/Tools/_TEMPLATE_
${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_
Init.py)
if(MSVC)
set_target_properties(_TEMPLATE_ PROPERTIES SUFFIX ".pyd")
@ -35,6 +40,7 @@ elseif(MINGW)
else(MSVC)
set_target_properties(_TEMPLATE_ PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_)
set_target_properties(_TEMPLATE_ PROPERTIES PREFIX "")
set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
install(TARGETS _TEMPLATE_ DESTINATION lib)

8
src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
View File

@ -1,3 +1,4 @@
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
@ -30,7 +31,11 @@ SET(_TEMPLATE_Gui_SRCS
add_library(_TEMPLATE_Gui SHARED ${_TEMPLATE_Gui_SRCS})
target_link_libraries(_TEMPLATE_Gui ${_TEMPLATE_Gui_LIBS})
fc_copy_script("Mod/_TEMPLATE_" "_TEMPLATE_Gui" InitGui.py)
fc_target_copy_resource(_TEMPLATE_Gui
${CMAKE_SOURCE_DIR}/src/Tools/_TEMPLATE_
${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_
InitGui.py)
if(MSVC)
set_target_properties(_TEMPLATE_Gui PROPERTIES SUFFIX ".pyd")
@ -45,6 +50,7 @@ elseif(MINGW)
else(MSVC)
set_target_properties(_TEMPLATE_Gui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_)
set_target_properties(_TEMPLATE_Gui PROPERTIES PREFIX "")
set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
endif(MSVC)
install(TARGETS _TEMPLATE_Gui DESTINATION lib)

2
src/Tools/_TEMPLATE_/Gui/Command.cpp
View File

@ -48,7 +48,7 @@ Cmd_TEMPLATE_Test::Cmd_TEMPLATE_Test()
sWhatsThis = QT_TR_NOOP("_TEMPLATE_ Test function");
sStatusTip = QT_TR_NOOP("_TEMPLATE_ Test function");
sPixmap = "Test1";
iAccel = Qt::CTRL+Qt::Key_H;
sAccel = "CTRL+H";
}
void Cmd_TEMPLATE_Test::activated(int iMsg)