7c42b75ac8
CMake: Update FindCg to discover cgD3D9
...
This also means renaming "CGDX9" to "CGD3D9" for consistency
with what Nvidia calls it.
2018-11-01 16:31:57 -06:00
f07b713e8d
CMake: Change FindOpenGLES* modules so they don't even try on Apple
2018-10-27 21:11:14 -06:00
11a75eab99
CMake: Build OpenGL ES (1&2) display modules
...
Also reorganizes Package.cmake a little, getting more of the
package discovery logic under the PackageConfig.cmake system.
2018-10-22 01:58:24 -06:00
56b211f902
CMake: Fix FindODE's include path finding
...
It needs to look for the path containing the "ode" directory,
not the "ode" directory itself.
2018-10-19 12:56:11 -06:00
cefc000235
CMake: Remove PATHS from FindEigen3
...
Why do we need these? CMake checks the "obvious" paths for us.
2018-10-18 19:27:47 -06:00
8dd46eb736
CMake: Redo ODE find module
...
This defines an ODE::ODE target; it also automatically selects
the correct `dIDESINGLE`/`dIDEDOUBLE` compile-time definition.
2018-10-18 19:27:47 -06:00
dd5c411e88
CMake: When building metalib components, properly flag SYSTEM include dirs
2018-10-18 13:42:12 -06:00
b3f1b7d40b
Merge branch 'cmake' of https://github.com/treamology/panda3d into cmake
...
# Conflicts:
# .travis.yml
# direct/src/showbase/CMakeLists.txt
# dtool/dtool_config.h.in
# dtool/src/prc/CMakeLists.txt
# panda/src/cocoadisplay/CMakeLists.txt
# panda/src/express/CMakeLists.txt
# panda/src/osxdisplay/CMakeLists.txt
2018-10-14 02:26:56 -06:00
1e38910d9d
CMake: Fix BuildMetalib's BUILDING_ symbol propagation
2018-10-13 15:07:09 -06:00
8610b2fceb
CMake: Simplify Interrogate's compiler definition discovery
...
This uses generator expressions to make sure the definitions are
discovered transitively. The output _igate.cxx file also has its
definitions applied to it via a source file property rather than
via add_definitions(), which prevents them from leaking to other
targets.
2018-10-13 15:06:57 -06:00
32a6552af4
CMake: Make BuildMetalib's link override more like CMake 3.12
2018-10-11 17:38:30 -06:00
47b5a50688
CMake: Don't always override target_link_libraries()
...
Previously, we would override target_link_libraries() to support
object "linking" since this wasn't supported in versions of CMake
before 3.12. Now that 3.12 is released, we only do it for versions
of CMake before that release.
2018-10-10 20:16:33 -06:00
a0d9a931e0
CMake: Simplify target_link_libraries "object" linking shim
...
This uses generator expressions instead, so that it's no longer
dependent on all linked component libraries existing first.
2018-10-10 20:16:32 -06:00
e89621b88d
CMake: "Flatten" metalibs more
...
By "flatten" I mean that component libraries aren't referenced by
genex anymore; instead, their include directories and libraries
are copied out of their interfaces and into the interface of
the metalib.
This prepares for exporting our targets, by making sure that the
component libraries don't have to be installed for CMake to be
able to export metalibs.
2018-10-10 20:16:32 -06:00
b8fa692e2f
CMake: Fix BuildMetalib on CMake 3.0.2
...
CMake now tests out correctly on 3.0.2 again.
2018-10-09 02:01:35 -06:00
f696bfbfe2
CMake: Clean up run_pzip
...
This should get rid of stray directories in the build
directory on Windows.
2018-10-09 02:01:35 -06:00
9b4b83c0e1
CMake: Properly propagate INTERFACE_COMPILE_DEFINITIONS to component libs
2018-10-07 00:51:26 -06:00
0997c6b19c
CMake: Don't depend on Python interpreter
...
This allows building against the Python libraries even when the
Python interpreter/executable is missing. The correct extensions
for the binary modules will be guessed, the tests will fail,
and the bytecode for any pure-Python modules will not be
precompiled.
2018-10-07 00:51:26 -06:00
53920e7aee
CMake: Move __init__.py generation to Python.cmake
...
This also allows us to generate a suitable __init__.py for fixing
up PATH and/or __path__ on platforms that need it to properly
import Python extension modules.
2018-09-28 21:24:26 -06:00
73e273e782
CMake: Remove hardcoded 'panda3d.*' assumptions from Python.cmake
2018-09-28 17:28:17 -06:00
2e2a8eae98
CMake: Byte-compile all .py files when building Panda
...
This also involves the creation a new include: Python.cmake
This file will contain utility functions for building Python
modules and installing Python packages.
2018-09-28 17:15:56 -06:00
bd187643f3
CMake: Look for packages by CONFIG first
...
This requires a macro to override find_package,
as the default behavior in CMake is to fall back
from MODULE onto CONFIG.
Note that Bullet is given a specific override
not to look for a CONFIG, since Bullet tends to
use weird paths in its CONFIG script.
2018-09-21 19:22:59 -06:00
968ca123d4
CMake: Use packages by imported target where available
...
This is preferable because imported targets generally include
all of the relevant information specific to the particular
installation of each package, and without needing to hunt down
a bunch of variables to do it.
To do this, package_option() (which is starting to grow in scope
a little beyond just providing the package option, come to think
of it) is given a new IMPORTED_AS option, which tells the package
configuration system to look for one or more imported targets and
link against them instead.
2018-09-21 16:24:48 -06:00
1520d712d4
CMake: Remove target_use_packages
...
Instead, let's use a PKG::PKGNAME interface library, which simplifies
the linking and also allows us to use imported libraries from
find_package in the future.
2018-09-21 10:17:05 -06:00
cf26888672
CMake: Stop using include_directories()
...
Setting this directly on the target is cleaner,
and in most cases, the INTERFACE_INCLUDE_DIRECTORIES
mechanism takes care of it for us.
2018-09-18 18:17:43 -06:00
193cf71233
CMake: Pass Python extension files to Interrogate with relative paths
...
This makes sure absolute paths don't show up in #include,
since Interrogate doesn't (currently) use the proper representation
for this. (See #386 )
2018-09-07 00:34:02 -06:00
9f55b9e77e
CMake: Don't Interrogate with deprecated -longlong on Windows
2018-09-07 00:33:52 -06:00
e501d20927
CMake: Don't compile Interrogate runtime code into interrogatedb
...
This should obviate the need for pystub as well.
Note that it's currently a little bit hacky; the source will
have to be moved to make the CMake dependencies work better.
2018-09-06 23:57:53 -06:00
0c889db928
CMake: Don't conflict with find_package internal variables
2018-09-05 19:19:36 -06:00
1970751c8a
CMake: Do something sensible with static Python modules
...
These *do* make sense and there are Panda3D users that use
this kind of configuration, so we should try to be accommodating.
2018-09-03 21:04:40 -06:00
77018c5383
CMake: Name Python targets more distinctively
...
Python targets are now prefixed with "panda3d." in
e.g. "panda3d.core"
2018-09-03 21:01:54 -06:00
76378c8990
CMake: Ask Python for preferred binary extension suffix
2018-08-19 23:10:20 -06:00
29bc62bf9b
CMake: Alias Interrogate
...
This allows us to have a different name for Interrogate
on the host vs. Interrogate on the target platform, which
facilitates cross-compiling.
2018-06-13 21:07:56 -06:00
21a30a8429
CMake: Make INTERROGATE_PYTHON_INTERFACE option dependent
...
This also makes it sufficient for turning on Interrogate.
2018-06-13 21:07:56 -06:00
2e98b68e3b
CMake: Make directbase/pandabase INTERFACE libraries
...
They export no code, and are really only used to contain several
preprocessor macros relevant to their respective packages. On
Windows, they're a problem: MSVC doesn't generate a .lib when
compiling a .dll that exports nothing.
2018-06-10 02:29:49 -06:00
a088e6aba5
CMake: Autogenerate metalib init files
2018-06-10 02:29:35 -06:00
cddd553d1e
Add COMPOSITE_SOURCE_EXCLUSIONS option
...
It specifies a list of targets to exclude during the compositing stage.
2018-06-06 09:16:26 -05:00
f54b4b61dd
CMake: Don't use pzip when not built
2018-06-01 02:56:43 -06:00
4c4c17cac2
CMake: Flag composite files as generated
...
No idea why this was commented out.
2018-05-26 18:01:05 -06:00
538c615abe
CMake: Light tidying in Interrogate.cmake
2018-05-14 19:07:27 -06:00
8e230495a1
CMake: Consolidate "module or static" library logic
2018-05-14 19:07:27 -06:00
5b3ca1bb05
CMake: Fix up the "transitive library" metalib logic
...
This fixes some cases where transitive libraries, as nominated
by a component library, were not being absorbed into a metalib,
due to the library actually not being defined yet. This makes the
logic a little more robust, first by explicitly requiring a metalib
definition to come after all component library definitions, and second
to assume a library "linked" to a component library is a non-component
if it isn't defined (yet).
2018-04-20 00:20:14 -06:00
218d0e8ade
CMake: Build dtool metalibs as metalibs
2018-04-19 00:07:08 -06:00
5a31844e11
CMake: Slightly tweak component-library -D inheritance rules
...
This only inherits -D flags from another component library. The private
-D flags should not be inherited from regular libraries.
2018-04-19 00:07:08 -06:00
4cec331722
CMake: Add support for building metalibs as metalibs
2018-04-18 14:42:56 -06:00
7590c37f0c
CMake: Have Interrogate respect INTERFACE_COMPILE_DEFINITIONS
...
This commit isn't technically quite right, since Interrogate should
use the definitions from COMPILE_DEFINITIONS but the module should
be built with INTERFACE_COMPILE_DEFINITIONS, but whatever. That can
be changed if it becomes a nuisance later on.
The rationale here is it's consistent with how CMake treats these
two properties.
2018-04-18 12:23:18 -06:00
c0b8b3c542
CMake: Interrogate bugfix for LINK and IMPORT keywords together
2018-04-15 00:35:49 -06:00
1401a1cc48
CMake: Don't use (SO)VERSION for modules
2018-04-05 16:11:59 -06:00
cfd603bb8d
CMake: Build Python binary modules as MODULE, never SHARED
2018-04-05 16:11:59 -06:00
411e0ee93f
CMake: Use interrogate's -import instead of linking directly
2018-04-05 16:11:59 -06:00
2f6c79b9e6
CMake: Build libraries with VERSION/SOVERSION
...
This takes advantage of SONAME and versioning on platforms that support it.
2018-04-02 15:49:05 -06:00
540c4fc2cd
CMake: Delete excess spaces
2018-02-21 02:54:09 -07:00
590523ac8c
CMake: Rename FindSquish to FindLibSquish
...
CMake already has a "FindSquish" for finding the GUI testing product.
This minimizes the chances of the wrong module being run on accident.
2018-02-20 18:58:52 -07:00
8b9d2c0f33
CMake: Delete FindEigen2, we rely on Eigen3+
2018-02-20 18:19:56 -07:00
0783013ecd
CMake: Custom targets don't need EXCLUDE_FROM_ALL
2018-02-18 20:24:27 -07:00
6907eb5207
CMake: Fix Interrogate -module panda3d.${module} flag missing
2018-02-18 03:57:56 -07:00
283db1fb7a
CMake: Implement detection for FFTW3
2018-02-17 23:35:43 -07:00
2399655920
CMake: Make sure Interrogate doesn't see package include directories
2018-02-17 16:56:35 -07:00
f75e245b1f
CMake: Enhance PackageConfig's include directory processing and name separation
2018-02-16 17:38:51 -07:00
021728f4b3
CMake: Start the process of organizing packages into Package.cmake
2018-02-14 16:46:20 -07:00
f8c63dbe2b
CMake: Refactor interrogate.cmake a little
...
In particular, rely on INTERROGATE_PYTHON_INTERFACE, not
HAVE_PYTHON AND HAVE_INTERROGATE.
2018-02-11 12:48:17 -07:00
b68b6caeb0
CMake: Support targeting Python 3
2018-02-09 22:06:14 -07:00
1d666a9841
CMake: Build the models, makepanda-style
2018-02-07 18:59:44 -07:00
d66f5fa8e2
CMake: Kill support for <2.8.12
...
The rationale for this is in a comment at the top of the main
CMakeLists.txt file. It was getting harder to maintain support for a
version this old, and pretty much no current system has CMake <3.
Good riddance.
2018-02-06 14:47:12 -07:00
e46890010a
cmake: Don't rely on $<TARGET_PROPERTY:...> in CMake < 2.8.10.
2016-12-02 20:41:22 -08:00
e58697bee4
cmake: Fix AutoInclude workaround always being used irrespective of version.
...
Also fixes Interrogate's reliance on the INTERFACE_INCLUDE_DIRECTORIES target
property before generation time by using a generator expression to determine
Interrogate's include flags.
2016-12-01 02:36:40 -08:00
3bd9750439
Merge branch 'cmake-proper-interrogate' into cmake
2014-10-11 18:15:59 -07:00
1fa1eb63cb
CMake: Don't use target_include_directories, it's not supported on CMake 2.8.4.
2014-08-02 20:26:15 -07:00
0d13247721
Merge branch 'cmake' into cmake-proper-interrogate
...
Conflicts:
cmake/macros/Interrogate.cmake
panda/src/express/CMakeLists.txt
panda/src/ode/CMakeLists.txt
2014-07-26 19:12:22 -07:00
a26df45c38
cmake: Fix Interrogate installation so that runtime paths are properly removed.
2014-04-28 16:21:10 -06:00
9d1254d440
cmake: Fix Eigen3 detection and support.
2014-04-17 02:56:56 -06:00
c82c0df266
cmake: Fix Interrogate macro bug causing component sources to get scanned along with their composite counterparts.
2014-04-16 06:07:55 -06:00
127dfe7c4d
cmake: Add FFMPEG compilation support.
2014-04-11 03:38:08 -06:00
c53a656b4b
cmake: Fix typo in PackageConfig.
2014-04-11 03:37:46 -06:00
1421627dd9
CMake: Deprecate the FOO_composite pseudotarget -- the hack that needed it is no longer around.
2014-03-30 04:50:14 -06:00
b300848589
CMake: Add new "EXTENSIONS" syntax to target_interrogate(...) macro.
2014-03-30 04:49:52 -06:00
161beda242
CMake: Add missing quotes in FindCg module.
2014-03-02 21:53:15 -07:00
3969d0e1ac
CMake: Link Interrogate bindings against metalibs.
2014-03-02 18:33:00 -07:00
f972221357
CMake: Detect ODE.
2014-02-08 16:20:57 -07:00
9fc2e6829b
CMake: Generate and install 'pandac' for backwards-compatibility.
2014-02-07 14:30:46 -07:00
e5a6259e46
CMake: Get Interrogated modules to install.
2014-02-06 16:33:34 -07:00
1d2561b012
CMake: Install the Interrogated _igate libraries. (Temporary; part of the dependency hack.)
2014-02-04 23:10:56 -07:00
95e25af828
CMake: Update Interrogate.cmake macro's use of COMPILE_DEFINITIONS:
...
- Slightly older versions of CMake default this to NOTFOUND, so test before iterating.
- Add to local definitions for building the _igate sources.
2014-02-04 14:56:04 -07:00
de9ea2a750
CMake: For Interrogate 64/32-bit detection, check sizeof(long) rather than sizeof(void*).
2014-02-03 21:57:27 -07:00
eced41b7c3
CMake: Move Interrogate.cmake's _LP64 detection to the top of the script, where it gets added to IGATE_FLAGS.
2014-02-03 21:47:27 -07:00
3dc38e0f61
CMake: Move ${INTERROGATE_*_OPTIONS} expansion to the add_custom_command proper; other CMake files may wish to set this after Interrogate.cmake is loaded.
2014-02-03 21:39:06 -07:00
8cd41a48af
CMake: Detect 64-bit vs. 32-bit when running Interrogate.
2014-02-03 11:54:51 -07:00
df69bba34a
CMake: Fix typos in Interrogate.
2014-02-02 14:55:17 -07:00
fd9aec6ee7
CMake: Fix Interrogate's dependency on the *_composite#.cxx files by creating an explicit target that can be used to do composite generation.
2014-02-02 12:24:18 -07:00
e150492355
CMake: Use LINK_LIBRARIES instead of INTERFACE_LINK_LIBRARIES in Interrogate macro, for compatibility with CMake < 2.8.12.
2014-02-01 14:24:22 -07:00
e3cee4f5cd
CMake: Add .N files to deps for Interrogate command.
2014-01-31 13:41:01 -07:00
57944c58d1
CMake: Invoke Interrogate with the same compiler definitions as the source itself.
2014-01-31 13:30:47 -07:00
75c1b937f8
CMake: Use "NOT varname" instead of testing for equality to -NOTFOUND.
2014-01-31 12:36:52 -07:00
20daa755f0
CMake: Update Interrogate macro to make paths relative to CMake source directory.
2014-01-31 09:10:23 -07:00
3f045f85f5
CMake: Hack up the Interrogate macro to work when the codebase depends on the Dtool_* stubs.
2014-01-30 18:55:40 -07:00
5fd958a9be
CMake: Completely re-do the Interrogate macro.
2014-01-30 18:55:14 -07:00
82a74dc281
Revert "Revert "Revise AutoInclude.cmake: My version of CMake, despite being >=2.8.11, doesn't actually support CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.""
...
This reverts commit a40bfdb9061ceb06925d2756166640b368896946.
2014-01-30 16:47:00 -07:00
f9d4a3ccef
CMake: Revert back to rdb's Interrogate. This can be done cleaner.
2014-01-30 15:47:00 -07:00
cebdcd1d43
Revert "Revise AutoInclude.cmake: My version of CMake, despite being >=2.8.11, doesn't actually support CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE."
...
This reverts commit 6a38e3c95df00da728cbd253c0bf80c22d0c419b.
2014-01-30 13:47:44 -07:00
c9a4228811
When interrogating under CMake, record INTERROGATE_DATABASE as a target property.
2014-01-30 13:16:18 -07:00
f8b901f60a
Fix incorrect licensing and add missing parens after else.
2014-01-30 09:39:29 -07:00
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
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
995688760b
In panda config, unset libraries we're not using so that they're not used as link targets.
2014-01-30 06:21:50 -07:00
8d3e7541ef
Update documentation for CMake build system.
2014-01-30 05:06:11 -07:00
dd817b70b8
Merge pull request #2 from kestred/config.cmake
...
Config.cmake
2014-01-30 03:54:45 -08:00
c20f38c383
Add additional output, CG_LIBRARIES, to FindCg.cmake.
2014-01-30 04:37:48 -07:00
72c180a82c
Massively update CMake's Interrogate macro. This gets several modules to build...
2014-01-29 14:39:38 -07:00
4fa6584fdf
Revise AutoInclude.cmake: My version of CMake, despite being >=2.8.11, doesn't actually support CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.
2014-01-29 14:39:15 -07:00
a842133002
Build egg's lexer case-insensitve under CMake. Fixes parse errors.
2014-01-29 05:46:59 -07:00
84aad872ec
Define add_flex_target CMake macro.
2014-01-27 10:10:27 -07:00
53ae0fb95b
Fix FindCG to output variables in a general and expected format.
2014-01-19 14:04:18 -07:00
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
9dd82f90c2
cmake: Update readme to match current cmake variable naming scheme.
2013-12-21 19:45:12 -07:00
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
c579f87007
cmake: Reorganize macros, and cleanup related files (add docs, etc)
2013-12-21 13:44:05 -07:00
b002c8299a
Work on Config.cmake (add documentation and such)
2013-12-14 17:28:51 +01:00
826979c099
CMake: Configure: Finish cleaning up finding packages.
2013-12-13 13:32:04 -07:00
c7b514bc75
CMake: Configure: Begin conversion to standard CMake find package syntax.
2013-12-13 03:27:52 -07:00
d1572173d3
CMake: Configure: Add XYZZY_LIBRARY(IES) variable declarations for Find packages. Other cleanup and reorginizaion.
2013-12-12 12:30:42 -07:00
4fa31ee4d6
CMake: Use option() instead of set(CACHE)
2013-12-12 10:24:39 -07:00
ee06025d43
CMake: Configure: Add Freetype support.
2013-12-11 11:00:43 -07:00
150624b27d
Add GTK2 support.
2013-12-11 10:53:39 -07:00
a6162615d7
CMake: Configure: Add forgotten Mangle module.
2013-12-09 22:25:30 -07:00
aaff5b9c4f
CMake: Configure: Add OpenAL support. Typo fix in CMake README.md.
2013-12-09 12:22:54 -07:00
4ac2363673
CMake: Configure: Add a "DISCOVERED" option to configure.
2013-12-09 11:40:25 -07:00
204d88f1e1
CMake: Configure: Improve Miles Sound System detection.
2013-12-09 09:46:46 -07:00
55089fda95
CMake: Configure: Add FMOD Ex support.
2013-12-09 03:30:49 -07:00
b4e19226fd
CMake: Add a ToDo list for things that prone to being accidently forgotten.
2013-12-09 02:25:58 -07:00
9790c6f504
CMake: Configure: Nominally support Miles Sound System. Can't actually test it, because I don't own it.
2013-12-09 02:23:44 -07:00
6d8ba55bed
CMake: Configure: Add zlib support.
2013-12-09 02:02:56 -07:00
31bb550bda
CMake: Bugfix: Fix bug where Cg was not set to found properly on first-pass configuration.
2013-12-09 00:44:03 -07:00
ebddd2292b
CMake: Configure: Remove cruft in ConfigurePackage module.
2013-12-09 00:43:29 -07:00
693f7b39cf
CMake: Configure: Add option to enable or disable all packages.
2013-12-09 00:11:39 -07:00
90e4926b94
CMake: Configure: Support VRPN.
2013-12-08 23:17:24 -07:00
6fe7b59801
CMake: Configure: Add cross-platform (openGL) Nvidia Cg support.
2013-12-08 20:59:17 -07:00
d03d5125a0
CMake: Configure: Add using and finding squish library.
2013-12-07 21:09:40 -07:00
a0b8deb745
CMake: Configure: Update to use the mangle_package and config_package functions.
2013-11-30 02:28:59 -07:00
1dc12b6ea1
CMake: Configure: Implement config_package and mangle_package functions with test-case uses.
2013-11-30 02:17:10 -07:00
b44101819c
CMake: Configure: Update config vars with USE_<PACKAGE> variables for each package that allow toggling of individual packages.
2013-11-30 01:03:08 -07:00
8abd710616
CMake: Configure: Add fftw support.
2013-11-29 02:14:00 -07:00
57b2079a3f
CMake: Modules: Cleanup FindEigen2/3 and use a consistent format with that of FindTar.cmake.
2013-11-29 01:38:01 -07:00
67be41a672
CMake: Configure: Add libtar support. First custom Find module.
2013-11-29 01:21:14 -07:00
df87842516
CMake: Libraries: Update other Manglers to cleanup properly.
2013-11-29 00:48:28 -07:00
b21b31dffd
CMake: Libraries: Add TIFF.
2013-11-29 00:48:08 -07:00
71889acb88
CMake: Begin implementing library detection and configuration.
2013-11-29 00:29:29 -07:00
Sam Edwards
Donny Lawrence
kestred
rdb