TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Turn OFF HAVE_CARBON by default

Browse Source
This commit is contained in:
Sam Edwards 2018-10-14 17:30:40 -06:00
parent e28d8353f4
commit 629ada63db
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -90,7 +90,7 @@ script:
export PY2_CMAKE_ARGS=-DPYTHON_EXECUTABLE=/usr/local/Frameworks/Python.framework/Versions/2.7/bin/python export PY2_CMAKE_ARGS=-DPYTHON_EXECUTABLE=/usr/local/Frameworks/Python.framework/Versions/2.7/bin/python
fi fi
cmake -DHAVE_CARBON=NO -DBUILD_METALIBS=$BUILD_METALIBS \ cmake -DBUILD_METALIBS=$BUILD_METALIBS \
-DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT \ -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT \
-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl $PY2_CMAKE_ARGS .. -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl $PY2_CMAKE_ARGS ..
else else

11
dtool/Config.cmake
View File

@ -532,13 +532,10 @@ else()
option(HAVE_WGL "Enable WGL. Requires OpenGL on Windows." OFF) option(HAVE_WGL "Enable WGL. Requires OpenGL on Windows." OFF)
endif() endif()
if(IS_OSX) cmake_dependent_option(HAVE_COCOA "Enable Cocoa. Requires Mac OS X." ON
option(HAVE_COCOA "Enable Cocoa. Requires Mac OS X." ON) "APPLE" OFF)
option(HAVE_CARBON "Enable Carbon. Requires Mac OS X." ON) cmake_dependent_option(HAVE_CARBON "Enable Carbon. Requires Mac OS X." OFF
else() "APPLE" OFF)
option(HAVE_COCOA "Enable Cocoa. Requires Mac OS X." OFF)
option(HAVE_CARBON "Enable Carbon. Requires Mac OS X." OFF)
endif()
# #
# <<<<<< Insert the rest of the Config.pp # <<<<<< Insert the rest of the Config.pp