Commit Graph

191 Commits

Author SHA1 Message Date
wmayer
18e3be01eb CMake: use XercesC_LIBRARIES to store debug and release version of xerces 2020-03-16 12:24:40 +01:00
wmayer
49475112b3 Cloud: [skip ci] add build option to compile Cloud module 2020-02-20 22:10:17 +01:00
wmayer
606606edec conda: fix conda build failure because CMAKE_SYSTEM_PROCESSOR is not defined 2020-02-17 19:25:12 +01:00
Zhang Wei
8111c9e2e5 Patch for MIPS64 Architecture 2020-02-15 19:32:58 +01:00
SolidDude
20267f1af1 Get cmake to find pythonlibs 3.x when python 2.7 is present 2020-02-15 17:30:19 +01:00
Adrian Schröter
68a3729422 Find uic and rcc on openSUSE
openSUSE (and most likely other distributions) is renaming uic and rcc
to avoid file conflicts with Qt4.

Prefer these if they exist
2020-01-27 10:09:15 +01:00
wmayer
6985ecec07 CMake: [skip ci] report which C++ standard is required 2020-01-16 13:53:26 +01:00
howetuft
1bbfc71f79 Change IF(...LESS...) into IF(...VERSION_LESS...) 2020-01-08 15:19:27 +01:00
howetuft
e2c4465e2b [Cmake] Update FindPySide2Tools for PySide2 5.14 - issue #4229
Since PySide2 5.14, 'pyside2-rcc' and 'pyside2-uic' have been renamed into plain 'rcc' and 'uic'.
This leads FindPySide2Tools.cmake to no longer find rcc/uic, as reported in bug #4229 (https://www.freecadweb.org/tracker/view.php?id=4229) and prevents compilation.
FindPySide2Tools has been updated accordingly.
2020-01-08 15:19:27 +01:00
looooo
3cf4aeb310 python: add option INSTALL_TO_SITEPACKAGES
If INSTALL_TO_SITEPACKAGES is enabled, the freecad-namespace package (freecad/__init__.py) is installed in the python-sitepackage-dir. Further, the library install path (CMAKE_INSTALL_LIBDIR)
is used to find the FreeCAD shared library. If, for some reason, one wants to import another installed FreeCAD version it's possible to set the environment variable "PATH_TO_FREECAD_LIBDIR" to
point to the wanted FreeCAD-library (FreeCAD.so / FreeCAD.dll)
2020-01-07 07:28:25 -03:00
wmayer
3bbd415523 Build option: do not force PCL to be always enabled on Win32, add option to allow to disable it 2019-11-29 16:15:16 +01:00
wmayer
dccfc474b4 Add option to copy required plugins from LibPack to build directory 2019-11-29 13:38:06 +01:00
wmayer
60dd9f3ab6 Fix cmake report to show correct Qt version 2019-11-24 12:36:05 +01:00
wmayer
9d723f38bc when using pcl do not allow it to override compiler flags 2019-11-22 14:46:01 +01:00
wmayer
6300e09dd8 handle some more warnings: -Wkeyword-macro -Wdeprecated-declarations -Wextra-semi 2019-11-18 11:56:08 +01:00
wmayer
cc6115920f set -Wpedantic for clang 2019-11-17 19:39:01 +01:00
looooo
1caf994858 cmake: pyside2: try other solution 2019-10-21 23:33:26 +02:00
wmayer
eff400620c add new CMake macro generate_from_any and extend PythonToCPP script to create source file from any text file 2019-10-14 22:20:59 +02:00
looooo
504cbd84a7 cmake: pyside2: we also need headers from shiboken and pyside2 2019-10-05 17:15:29 +02:00
looooo
84fe44cb32 cmake: pyside2 config fix 2019-09-28 12:43:28 +02:00
sgrogan
6e1b8052d8 Copy files from libpack to build or install directory:
Windows- copy plugins/styles and plugins/printsupport to bin
copy libpack/bin/QtWebEngineProcess.exe and libpack/bin/qt.conf to build/bin
copy assistant.exe to build/bin
2019-09-27 11:09:10 +02:00
wmayer
91224df805 clean-up FreeCADLibpackChecks.cmake 2019-09-26 23:42:13 +02:00
ezzieyguywuf
06af0151a9 Reverted FreeCadMacros.cmake to what is in master. 2019-09-26 18:55:33 +02:00
ezzieyguywuf
6b250d5116 Cleaned up a debug message and removed legacy file. 2019-09-26 18:55:11 +02:00
ezzieyguywuf
aa7419b203 Move logic out of CMakeLists.txt
This is an initial pass, simply moving the existing logic as-is. Future
PR's will attempt to refactor and improve the cmake stuff.
2019-09-26 18:54:45 +02:00
wmayer
ca51dec921 do not force CMAKE_INSTALL_LIBDIR to be an absolute path 2019-08-22 16:57:10 +02:00
Tomas Pavlicek
2c634d84af Add QtXmlPatterns to CMake lists 2019-06-11 15:46:46 -04:00
wmayer
e094ce4faf make PCL check quiet in case PCLConfig.cmake file is missing 2019-03-31 13:13:54 +02:00
wmayer
c0aac1e038 use STATUS in message command as otherwise in the GUI of cmake output will be in red and thus might be confusing 2019-03-31 10:29:00 +02:00
Stian Skjelstad
0165409f3f Commit 980941ca8d37a2db122c143e9cab2ce1addf03e4 "remove unused option FREECAD_MAINTAINERS_BUILD" removed the very last mention eigen2 2019-03-31 10:07:15 +02:00
Stian Skjelstad
4603739dae If COIN3D is not found with pkg-config, but with manual search, the only output seen on the screen is an error message. Add a success-message! 2019-03-31 10:06:28 +02:00
Stian Skjelstad
b7233eb378 When using cMake find_package_handle_standard_args(), we might aswell give it the version number detected aswell 2019-03-31 10:06:14 +02:00
Stian Skjelstad
89aa6b31cb Spelling error in variable name, caused the setting to never be applied: SPANV_LIBRARY vs SPNAV_LIBRARY 2019-03-31 10:05:55 +02:00
MA-DEVELOP\apeltauer
5419db56dc use the pcl cmake config file to configure pcl 2019-03-30 15:51:26 +01:00
Stian Skjelstad
0905206018 Detection of NETGEN_VERSION is needed if using Netgen package provided cmake file too.
Do not overwrite NETGEN_VERSION that might be cached. Use a new variable instead, NETGEN_VERSION_C.

Use cmake internal system to specify std=c++14, else you can end up with  `c++ -DFOO -std=c++14 -Ibar -std=c++11`, and the latter is used.
2019-01-24 14:52:21 +01:00
Stian Skjelstad
6e2990ce6d Netgen provided cmake file, has the include directories to use in plural.
Netgen provided cmake file, and the internal detection, had different casing
for the _FOUND variable

When detecting the Netgen include-directories, we only want the /include in
addition to the global one. To include a given header file, specify which
part of the library, or use the one from the project/include directory.
2019-01-24 14:52:03 +01:00
Stian Skjelstad
4746396e7c Improve error-message if med.h is not found in CMake, and write all
commands in upper case, following the common syntax
2018-12-24 11:01:39 -02:00
Stian Skjelstad
e0106b946f On my Ubuntu setup, compilation failes when using med.h, since
libmedc is built with openMPI, while freeCAD selects hdf5-serial.

libmed declares functions prototypes which has MPI parameters if
built for openMPI, causing compilation errors. Doing some online
searches reveals that some users manually changes the include-paths
to hdf5-openmpi if this error happens.

This patch tries to autodetect this situation.
2018-12-24 11:01:39 -02:00
Bernd Waibel
9c8395fda7 Improve search for coin3d tag file
Currently cmake looks for coin.tag and coin.tag.gz when searching a
tag file of the Coin3D documentation. On some coin3d installations,
the tag file is named Coin.tag or Coin.tag.gz. This patch improves
the search by adding additional hints to the find_file() test for
the tag file.
2018-09-01 20:58:40 +02:00
wmayer
4b29b6c5d5 reduce compile time after each time cmake configure is executed (Version.h) 2018-08-21 14:06:33 +02:00
wmayer
2912fd7c62 macro to check for different input and output file and if needed replace output file 2018-08-21 13:52:42 +02:00
wmayer
8088aa159f CMake 2.8.12 and lower allowed the SOURCE signature in add_custom_command
In CMake 3.0 the policy CMP0050 was introduced where it could be set to OLD to keep this behaviour while for NEW an error was raised.
Since CMake 3.5.2 a warning comes up when using the OLD behaviour and that it will be removed in a future version.

In FreeCAD we switched to the new behaviour now and removed the SOURCE signature from add_custom_command which affects the macros
fc_copy_sources, fc_target_copy_resource and fc_target_copy_resource_flat and their usage.
It's not possible any more to add files to a target by using the macros. Now a file must be added to the target before using the macros.

This commit fixes it for Arch, Draft, OpenSCAD, Material, Plot and Ship
2018-08-20 11:47:39 +02:00
wmayer
ad22eb317e clean up cmake macros add new macro fc_target_copy_resource_flat 2018-08-19 22:54:33 +02:00
wmayer
5012668a40 move cmake policy CMP0050 to new style 2018-08-19 13:59:42 +02:00
wmayer
dff2d6074f fix broken generate_from_xml macro 2018-08-19 13:34:05 +02:00
Peter Lama
d7a262af21 Fix build error on MacOS due to sed command usage
Non GNU sed on macOS expects suffix after -i option (can be empty str).
However, removing the comments from the pyside generated files is not a necessary
operation (presumably done to avoid a diff when no code changed), so simply skip the operation on macOS
2018-08-15 09:13:03 +02:00
Kyrre Sjobak
8728b3617a Give FindNETGEN a path hint so that it ACTUALLY works with the standard Fedora 28 netgen package. 2018-08-12 20:19:01 +02:00
Kyrre Sjobak
166932b482 Give FindNETGEN a path hint so that it works with the standard Fedora 28 netgen package. 2018-08-12 20:19:01 +02:00
Kyrre Sjobak
5a7c1af40e Give FindMEDFile a path hint so that it works with the standard Fedora 28 med-devel package. 2018-08-12 20:19:01 +02:00
Ryan Pavlik
9ee259a41a Apply equivalent changes to FindPySide2Tools as FindPySideTools.
These are largely matching files, potential to de-duplicate them, but this
just ports the changes over for now.
2018-08-11 17:39:15 +02:00