haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MacOSX compilation fixes

This commit is contained in:
Miguel Angel Ajo 2013-01-10 23:10:05 +01:00
parent 4cb0cf6402
commit 0fedf6b3eb
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/ptr_container/detail/static_move_ptr.hpp
View File

@ -32,6 +32,11 @@
#pragma warning(disable:4521) // Multiple copy constuctors. #pragma warning(disable:4521) // Multiple copy constuctors.
#endif #endif
#ifdef __APPLE__
// this fixes some already defined "check" in MacOSX headers
#undef check
#endif
namespace boost { namespace ptr_container_detail { namespace boost { namespace ptr_container_detail {

18
pcbnew/CMakeLists.txt
View File

@ -331,9 +331,9 @@ if (KICAD_SCRIPTING_MODULES)
endif (KICAD_SCRIPTING_MODULES) endif (KICAD_SCRIPTING_MODULES)
if ((KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES) AND NOT WIN32) if ((KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES) AND NOT WIN32 AND NOT APPLE)
set ( PCBNEW_EXTRA_LIBS "rt" ) set ( PCBNEW_EXTRA_LIBS "rt" )
endif ((KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES) AND NOT WIN32) endif ((KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES) AND NOT WIN32 AND NOT APPLE)
### ###
@ -430,11 +430,19 @@ target_link_libraries(pcbnew
install(TARGETS pcbnew install(TARGETS pcbnew
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
if(WIN32)
set(FINAL_EXE,pcbnew.exe)
elseif(APPLE)
set(FINAL_EXE,pcbnew.app/Contents/MacOS/pcbnew)
else()
set(FINAL_EXE,pcbnew)
endif(WIN32)
if(KICAD_SCRIPTING) if(KICAD_SCRIPTING)
add_custom_target(FixSwigImportsScripting ALL
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripting/fixswigimports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py add_custom_target(FixSwigImportsScripting ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pcbnew ${CMAKE_CURRENT_SOURCE_DIR}/../scripting/fixswigimports.py ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FINAL_EXE}
COMMENT "Fixing swig_import_helper in Kicad scripting" COMMENT "Fixing swig_import_helper in Kicad scripting"
) )