Commit Graph

2015 Commits

Author SHA1 Message Date
Sam Edwards 5e78a80acc CMake: When HAVE_PYTHON, detect the Python install directories. Also, only include Python directories if HAVE_PYTHON. 2014-02-06 16:33:27 -07:00
Sam Edwards cc7e03f5eb CMake: Fix typo. 2014-02-06 13:37:46 -07:00
Sam Edwards f5f2f39a30 CMake: Remove PYTHON_LIBRARIES link from interrogatedb; it's unused there. 2014-02-05 18:09:18 -07:00
Sam Edwards ad7f590ca3 Merge branch 'cmake' into cmake-cfs-install
Conflicts:
	panda/CMakeLists.txt
	panda/src/audio/CMakeLists.txt
	panda/src/movies/CMakeLists.txt
	panda/src/pnmtext/CMakeLists.txt
2014-02-05 17:38:03 -07:00
rdb 872ffb12c1 Merge pull request #4 from kestred/cmake-cfs-igate2
Update Interrogate.cmake; generate panda3d.core and panda3d.egg modules.
2014-02-05 20:34:19 +01:00
Sam Edwards 5e77793b0f CMake: Add some install(...) directives. 2014-02-04 22:43:23 -07:00
Sam Edwards 2a85cd7a5b CMake: dtoolbase/dtoolutil may need to link against Python. 2014-02-04 11:28:06 -07:00
Sam Edwards c4ade7f8b9 Move OpenSSL parser-inc files to openssl/ subdirectory. 2014-02-03 12:09:20 -07:00
rdb 710568fb28 HAVE_GTK -> HAVE_GTK2 2014-02-02 12:31:06 +01:00
rdb 6e86570b9a ppremake-style output report 2014-02-02 10:12:18 +01:00
Sam Edwards 33142e0b59 CMake: Build interrogate_module. 2014-01-30 13:18:11 -07:00
kestred f5fbe25724 Build shared libs by default in cmake builds. 2014-01-30 10:32:25 -07:00
kestred f8b901f60a Fix incorrect licensing and add missing parens after else. 2014-01-30 09:39:29 -07:00
kestred bb19d8cb23 Enable package filtering by license in Distribution builds, and disable most packages by default in MinSizeRel builds. 2014-01-30 09:33:20 -07:00
kestred b2f928ade5 Add "Distribution" build type, and improve doc/organization for basic CMake stuff. 2014-01-30 08:55:19 -07:00
kestred f0a7a4d12b Removed outmoded DO_DEBUG for IS_DEBUG_BUILD 2014-01-30 07:00:01 -07:00
kestred b04ebdda98 Have package_option automatically generate option library targets instead of checking in every instance they're used. 2014-01-30 06:47:09 -07:00
kestred 9a9f06c984 Config.cmake: Add X11 location and option. 2014-01-30 04:16:26 -07:00
kestred 99b4760991 dtool/Config.cmake: Add missing empty option to BUILD_IPHONE. 2014-01-30 04:01:57 -07:00
Sam Edwards 82854ac1e8 Under CMake, generate dtool_config.h into build/include/ instead of build/ and use build/include/ as the global include directory. 2014-01-29 10:41:01 -07:00
Sam Edwards 456967069e Fix syntax problems in Config.cmake. 2014-01-27 10:09:07 -07:00
kestred d1c5c20983 Continue Config.pp port and cleanup build-type conditional defaults. 2014-01-26 22:21:19 -07:00
kestred 4a2ee83df9 Rearrange Config.cmake and cotninue porting Config.pp 2014-01-26 21:33:49 -07:00
Sam Edwards 0f89ef1e7b In CMake, link a few libraries against other libraries that they depend on. 2014-01-26 18:06:37 -07:00
kestred a0eeccf381 Add missing compiler define in CMakeLists for dtool/metalibs/dtoolconfig. 2014-01-26 11:22:48 -07:00
kestred b25669af6f Merge remote-tracking branch 'upstream/master' into cmake 2014-01-25 22:17:41 -07:00
kestred 25771c6629 Cleanup some dtool/package.cmake find variables. 2014-01-22 00:53:32 -07:00
kestred dd495b5573 Rename FindFFTW to FindFFTW3 and comment out configuration for it. FindFFTW3 was implemented, but Panda expects FFTW2. 2014-01-19 12:07:20 -07:00
kestred f4bf740362 Fix HAVE_LOCKF in dtoolbase.h for python headers that don't define it. 2014-01-19 17:33:19 -07:00
kestred b940bbc88e Add python_libaries for linker to p3interrogatedb target (when not HAVE_PYTHON, PYTHON_LIBRARIES will be empty). 2014-01-19 00:53:11 -07:00
kestred 9ee6e59795 Change %pure_parser to %pure-parser in cppBison.yxx (%pure_parser is very very deprecated) 2014-01-19 00:45:02 -07:00
kestred 3fd5f58583 Add #ifdef and #undef where necessary to prevent duplicate definitions. 2014-01-19 00:44:14 -07:00
kestred b07ce7dc93 Add include guards to our generated dtool_config.h 2014-01-19 00:28:55 -07:00
rdb a10bbe9c9e One more pystub symbol for Python 3 that's used in direct 2013-12-23 21:06:20 +00:00
kestred f81b14a70b cmake: config: Finish updating config to use the same variables as used in-source. 2013-12-21 19:41:23 -07:00
kestred 8cdc819344 cmake: config: Move new package macros to cmake/macros, use new package macros in Package.cmake, begin removing redundant package/config options from Package.cmake (theses are being moved to Config.cmake). 2013-12-21 19:30:53 -07:00
rdb 693159b1c7 Merge branch 'cmake' of ssh://github.com/kestred/panda3d into cmake
Conflicts:
	CMakeLists.txt
2013-12-22 00:20:01 +01:00
rdb 5fdf4828be package macros, add stuff to Config.cmake 2013-12-22 00:18:57 +01:00
kestred f3d7a325ab cmake: bugfix: Should be #ifdef HAVE_GL not #if HAVE_GL 2013-12-21 15:12:22 -07:00
kestred 87dba6f064 cmake: packages: Add SDL find and config, general bugfixing and cleanup 2013-12-21 14:58:38 -07:00
kestred 89e0cd9d96 cmake: packages: Add OpenGL find and config. 2013-12-21 14:39:49 -07:00
kestred 9c42b3602f cmake: packages: Add FLTK find and config. 2013-12-21 14:36:22 -07:00
kestred 26b3d826b9 cmake: packages: add support for wxwidgets 2013-12-21 14:31:17 -07:00
kestred 7321c7b4b7 cmake: add missing prc variables to the mark_as_advanced declaration. 2013-12-21 13:46:47 -07:00
kestred 1fc064104f cmake: Rename dtool/Packages.cmake to dtool/Package.cmake to keep consistency with ppremake. 2013-12-21 13:46:28 -07:00
kestred c579f87007 cmake: Reorganize macros, and cleanup related files (add docs, etc) 2013-12-21 13:44:05 -07:00
rdb 4944d7cd7b use compare_to and get_class_type instead of compareTo and getClassType 2013-12-18 10:24:00 +00:00
rdb 708e8dc513 Remove HAVE_GETTIMEOFDAY which we aren't using 2013-12-17 18:01:54 +00:00
rdb f29c4681e1 Fix broken Python 3 support. 2013-12-17 17:42:16 +00:00
rdb 634c3c5a0a Stubs for Python 3 functions 2013-12-17 15:03:30 +00:00