Commit Graph

163 Commits

Author SHA1 Message Date
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
Ryan Pavlik
b45a297428 Fix typo in FreeCadMacros.cmake 2018-08-11 17:39:15 +02:00
Ryan Pavlik
0714f6b926 Quote paths used in FindPySideTools.cmake 2018-08-11 17:39:14 +02:00
Ryan Pavlik
6346401827 Fix policy warning with CMake (regarding "no rules to generate")
Fixed by using add_custom_command instead of execute_process,
with an in-place sed command included to strip timestamp just like
previous code.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
b3a9bde349 Clean up and make FindPySideTools CMake module more robust 2018-08-11 17:39:13 +02:00
Ryan Pavlik
af12b35719 Add fc_target_copy_resource/fc_copy_sources build message
Includes optional verbosity param for tracking down "two rules for..."
ninja/etc warnings.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
6cd4079a2d Clean up and fix generate_from_py and generate_from_xml CMake macros
Includes native-path-usage fixing like the previous commit.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
e4b770ab5e Clean up and improve fc_copy_sources and fc_target_copy_resource CMake macros
The previous steps of TO_NATIVE_PATH followed by ABSOLUTE
is not meaningful or reliable: output of ABSOLUTE is always in
"cmake" path format, not native path format. Native path input to
CMake commands may not do what you want.
2018-08-11 17:39:13 +02:00
Ryan Pavlik
539dea85a2 Clean up and improve "COPY_IF_DIFFERENT" CMake macro 2018-08-11 17:39:12 +02:00
Kurt Kremitzki
5723c48cd0 Detect OCCT at new Debian location 2018-07-11 21:13:35 -03:00
wmayer
e865acf1ec fix cmake warning due to inconsistent naming 2018-05-31 13:44:03 +02:00
looooo
53d6974ba1 cmake:occt: add fallback 2018-05-31 11:02:33 +02:00
looooo
db41bed7f7 simplify cmake-setup of netgen and occt
using default cmake-configs to access cmake-variables
2018-05-28 14:23:05 +02:00
wmayer
fca625f33e fix version check for cmake < 3.7 2018-04-30 08:16:15 +02:00
Richard Shaw
b771659631 Detect pycxx version and add source for version 7 and greater. 2018-04-29 20:56:49 +02:00
wmayer
16ea64c951 minor fixes in FindPyCXX check 2018-04-18 19:52:43 +02:00
wmayer
53f54b62f3 don't make existence of PySide2 mandatory 2018-04-16 13:50:38 +02:00
looooo
fddb37c892 workaround for netgen to use latest netgen/master 2018-02-01 21:29:25 +01:00
wmayer
a802247ec1 fix possible build failure on Debian 9 2017-12-08 15:30:46 +01:00
looooo
95297a0c31 py3: /cMake gathering commits for cmake
mostly this changes are necessary to build FreeCAD with py3 (and conda) on windows.
issue 0000995
2017-06-01 19:42:13 +02:00
Markus Hovorka
4816c1c5af Honor CMAKE_INSTALL_RPATH in SET_BIN_DIR
set_target_properties used up until now in the SET_BIN_DIR macro sets
the INSTALL_RPATH property and discards whatever it contained before.
The INSTALL_RPATH target property is initialized with the cache variable
CMAKE_INSTALL_RPATH (possilbly given via the -D option of cmake). To
preserve this "default" value this commit replaced set_target_properties
with set_property(... APPEND ...).
2017-05-31 23:08:16 +02:00
Kunda
a7414e5789 source typo fixes pt1 (only on py3 merged code)
issue 0002914
2017-02-27 11:32:47 +01:00
Johannes Obermayr
06bb8d69eb Fix RPATHS for area-native and area libs on Linux. 2017-02-10 21:09:49 +01:00
Johannes Obermayr
6f6a038418 Support for NETGEN 6.2.
Upstream changed:
https://sourceforge.net/p/netgen-mesher/git/ci/7e4892a

There is also a pending request to fix NETGEN build, installation and version detection after 6.1:
https://sourceforge.net/p/netgen-mesher/git/merge-requests/1/

Just a note:
NETGEN development happens on https://gitlab.asc.tuwien.ac.at/jschoeberl/netgen but it is a very hard/strange way to find that out and get in contact with NETGEN developers as well as getting permission to fork the repository there to create a pull request.
Maybe some other developer can get in contact with NETGEN developers ...
2016-12-25 14:01:07 +01:00
Mateusz Skowroński
9d69d4a51a Use PySide2 tools for Qt5. 2016-12-24 15:33:15 +01:00
wmayer
b68734efe0 Add cmake switch to choose between official OpenCascade version and community edition 2016-11-17 17:46:42 +01:00
Bruce B. Lacey
65711e6883 Fix FindNETGEN.cmake to properly set netgen search path to HOMEBREW_PREFIX, when using homebrew, instead of the netgen cellar 2016-10-10 13:38:21 -03:00
wmayer
d8a6d5257f fix build problems with netgen under Linux 2016-09-10 19:17:37 +02:00
wmayer
52f5c72bc8 support of Netgen with split libraries and handle Debug & Release libraries on Windows 2016-09-04 02:46:08 +02:00