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

Fix error in install target, option to prepare for debian build

Browse Source
This commit is contained in:
wmayer 2012-02-17 23:22:17 +01:00
parent 5f140253fa
commit 388eded3dd
5 changed files with 18 additions and 15 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_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_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_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
# ============================================================================== # ==============================================================================

22
src/3rdParty/CMakeLists.txt vendored
View File

@ -20,16 +20,18 @@ elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE7X)
#endif(MINGW) #endif(MINGW)
# applies for Unix, MinGW and Windows with custom LibPack # applies for Unix, MinGW and Windows with custom LibPack
elseif(FREECAD_BUILD_GUI) elseif(FREECAD_BUILD_GUI)
find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR}) if (NOT FREECAD_BUILD_DEBIAN)
if (COIN_VERSION3) find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5) if (COIN_VERSION3)
add_subdirectory(Pivy-0.5) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5) add_subdirectory(Pivy-0.5)
else (COIN_VERSION3) endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy-0.5)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy) else (COIN_VERSION3)
add_subdirectory(Pivy) if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy) add_subdirectory(Pivy)
endif(COIN_VERSION3) endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
endif(COIN_VERSION3)
endif (NOT FREECAD_BUILD_DEBIAN)
endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X) endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
# For Windows we have all stuff in the LibPack # For Windows we have all stuff in the LibPack

2
src/3rdParty/Pivy-0.5/CMakeLists.txt vendored
View File

@ -123,4 +123,4 @@ fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
) )
install(TARGETS soqt DESTINATION bin/pivy/gui) install(TARGETS soqt DESTINATION bin/pivy/gui)
install(FILES __init__.py soqt.py DESTINATION bin/pivy/gui) install(FILES gui/__init__.py soqt.py DESTINATION bin/pivy/gui)

2
src/3rdParty/Pivy/CMakeLists.txt vendored
View File

@ -123,4 +123,4 @@ fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
) )
install(TARGETS soqt DESTINATION bin/pivy/gui) install(TARGETS soqt DESTINATION bin/pivy/gui)
install(FILES __init__.py gui/soqt.py DESTINATION bin/pivy/gui) install(FILES gui/__init__.py gui/soqt.py DESTINATION bin/pivy/gui)

6
src/Base/CMakeLists.txt
View File

@ -68,7 +68,7 @@ if(SWIG_FOUND)
add_definitions(-DHAVE_SWIG=1) add_definitions(-DHAVE_SWIG=1)
endif(SWIG_FOUND) endif(SWIG_FOUND)
if (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++) if (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++ AND NOT FREECAD_BUILD_DEBIAN)
SET(zipios_SRCS SET(zipios_SRCS
../zipios++/backbuffer.h ../zipios++/backbuffer.h
../zipios++/basicentry.cpp ../zipios++/basicentry.cpp
@ -122,12 +122,12 @@ SET(zipios_SRCS
../zipios++/zipoutputstream.h ../zipios++/zipoutputstream.h
) )
SOURCE_GROUP("zipios" FILES ${zipios_SRCS}) SOURCE_GROUP("zipios" FILES ${zipios_SRCS})
else (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++) else (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++ AND NOT FREECAD_BUILD_DEBIAN)
set(FreeCADBase_LIBS set(FreeCADBase_LIBS
${FreeCADBase_LIBS} ${FreeCADBase_LIBS}
-lzipios -lzipios
) )
endif (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++) endif (EXISTS ${CMAKE_SOURCE_DIR}/src/zipios++ AND NOT FREECAD_BUILD_DEBIAN)
SET(pycxx_SRCS SET(pycxx_SRCS
../CXX/Config.hxx ../CXX/Config.hxx