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

Fixes for MacOSX

Browse Source
This commit is contained in:
wmayer 2012-10-26 12:59:43 +02:00
parent 60cd7ee95b
commit 99b6a0c4c3
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Base/PyExport.h
View File

@ -40,6 +40,15 @@
#endif
#include <Python.h>
#ifdef FC_OS_MACOSX
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#endif
namespace Base
{

11
src/Base/PyObjectBase.h
View File

@ -35,7 +35,16 @@
// needed header
#undef slots
# include <Python.h>
#include <Python.h>
#ifdef FC_OS_MACOSX
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#endif
#define slots
#include <iostream>
#include <bitset>

9
src/CXX/WrapPython.h
View File

@ -56,5 +56,14 @@
// pull in python definitions
#include <Python.h>
#ifdef FC_OS_MACOSX
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#endif
#endif

10
src/Doc/CMakeLists.txt
View File

@ -64,6 +64,7 @@ if(DOXYGEN_FOUND)
${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg @ONLY)
if( FREECAD_MAINTAINERS_BUILD )
if (WIN32)
ADD_CUSTOM_TARGET(SourceDocu
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
COMMAND ${QT_HELPCOMPILER_EXECUTABLE} "\"${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qhp\""
@ -71,6 +72,15 @@ if(DOXYGEN_FOUND)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
)
else(WIN32)
ADD_CUSTOM_TARGET(SourceDocu
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
COMMAND ${QT_HELPCOMPILER_EXECUTABLE} "${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qhp"
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qch ${CMAKE_BINARY_DIR}/doc/FreeCADSource.qch
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
)
endif(WIN32)
ADD_CUSTOM_TARGET(UserDocu
${PYTHON_EXECUTABLE}