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

Fix compilation on Mac + small filename typo.

Browse Source
This commit is contained in:
Ian Rees 2016-01-28 20:52:39 +13:00 committed by wmayer
parent a40e398227
commit c70114f8da
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -88,10 +88,13 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
endif(BUILD_ENABLE_CXX11) endif(BUILD_ENABLE_CXX11)
set(CMAKE_CXX_FLAGS "-Wall -Wno-deprecated -Wno-write-strings ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-Wall -Wno-deprecated -Wno-write-strings ${CMAKE_CXX_FLAGS}")
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
# get linker errors as soon as possible and not at runtime e.g. for modules # get linker errors as soon as possible and not at runtime e.g. for modules
if(UNIX) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined") set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined,error")
endif(UNIX) elseif(UNIX)
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
endif()
endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
# ================================================================================ # ================================================================================

2
src/Mod/TechDraw/Gui/CMakeLists.txt
View File

@ -50,7 +50,7 @@ SOURCE_GROUP("Moc" FILES ${TechDrawGui_MOC_SRCS})
qt4_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc) qt4_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
set(TechDrawGui_UIC_SRCS set(TechDrawGui_UIC_SRCS
DlgPrefsTechDrawImp.ui DlgPrefsTechDraw.ui
TaskProjGroup.ui TaskProjGroup.ui
) )