TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with extra flags

Browse Source
This commit is contained in:
Donny Lawrence 2018-05-19 10:30:26 -05:00
parent 8b51b0faeb
commit 1b3c6fb444
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
direct/src/showbase/CMakeLists.txt
View File

@ -4,11 +4,12 @@ set(P3SHOWBASE_FILES
set(P3SHOWBASE_EXTRA_ARGS "") set(P3SHOWBASE_EXTRA_ARGS "")
if(IS_OSX) if(IS_OSX)
list(APPEND P3SHOWBASE_FILES showBase_assist.mm) list(APPEND P3SHOWBASE_FILES showBase_assist.mm)
set(P3SHOWBASE_EXTRA_ARGS "-ObjC++")
endif() endif()
add_component_library(p3showbase SYMBOL BUILDING_DIRECT_SHOWBASE ${P3SHOWBASE_FILES}) add_component_library(p3showbase SYMBOL BUILDING_DIRECT_SHOWBASE ${P3SHOWBASE_FILES})
set_target_properties(p3showbase PROPERTIES COMPILE_FLAGS ${P3SHOWBASE_EXTRA_ARGS}) if(APPLE)
set_target_properties(p3showbase PROPERTIES COMPILE_FLAGS "-ObjC++")
endif()
target_link_libraries(p3showbase p3directbase panda) target_link_libraries(p3showbase p3directbase panda)
target_interrogate(p3showbase ALL) target_interrogate(p3showbase ALL)

3
dtool/src/dtoolutil/CMakeLists.txt
View File

@ -29,7 +29,6 @@ set(P3DTOOLUTIL_HEADERS
if(APPLE) if(APPLE)
set(P3DTOOLUTIL_HEADERS ${P3DTOOLUTIL_HEADERS} set(P3DTOOLUTIL_HEADERS ${P3DTOOLUTIL_HEADERS}
filename_assist.mm filename_assist.h) filename_assist.mm filename_assist.h)
set(P3DTOOLUTIL_EXTRA_FLAGS "-ObjC++")
set_source_files_properties(filename_assist.mm filename_assist.h PROPERTIES WRAP_EXCLUDE YES) set_source_files_properties(filename_assist.mm filename_assist.h PROPERTIES WRAP_EXCLUDE YES)
endif() endif()
@ -68,7 +67,6 @@ composite_sources(p3dtoolutil P3DTOOLUTIL_SOURCES)
add_component_library(p3dtoolutil SYMBOL BUILDING_DTOOL_DTOOLUTIL add_component_library(p3dtoolutil SYMBOL BUILDING_DTOOL_DTOOLUTIL
${P3DTOOLUTIL_HEADERS} ${P3DTOOLUTIL_SOURCES}) ${P3DTOOLUTIL_HEADERS} ${P3DTOOLUTIL_SOURCES})
set_target_properties(p3dtoolutil PROPERTIES COMPILE_FLAGS ${P3DTOOLUTIL_EXTRA_FLAGS})
# The extensions need py_panda.h and extension.h from interrogatedb # The extensions need py_panda.h and extension.h from interrogatedb
target_include_directories(p3dtoolutil PUBLIC target_include_directories(p3dtoolutil PUBLIC
$<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>) $<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>)
@ -76,6 +74,7 @@ target_link_libraries(p3dtoolutil p3dtoolbase ${CMAKE_DL_LIBS})
target_interrogate(p3dtoolutil ALL EXTENSIONS ${P3DTOOLUTIL_IGATEEXT}) target_interrogate(p3dtoolutil ALL EXTENSIONS ${P3DTOOLUTIL_IGATEEXT})
if(APPLE) if(APPLE)
set_target_properties(p3dtoolutil PROPERTIES COMPILE_FLAGS "-ObjC++")
find_library(FOUNDATION_LIBRARY Foundation) find_library(FOUNDATION_LIBRARY Foundation)
find_library(APPKIT_LIBRARY AppKit) find_library(APPKIT_LIBRARY AppKit)
target_link_libraries(p3dtoolutil ${FOUNDATION_LIBRARY} ${APPKIT_LIBRARY}) target_link_libraries(p3dtoolutil ${FOUNDATION_LIBRARY} ${APPKIT_LIBRARY})