reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-26 04:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,775 Commits 4 Branches 185 Tags 113 MiB
a52ebca54c
Commit Graph

2169 Commits

Author SHA1 Message Date
Eric Noulard
147aa6bf80 CPackRPM: tolerate redhat specific clean BUILD ROOT pre-build macro (bug 9872) 
Eric
 2009-11-15 13:55:42 -05:00
Alexander Neundorf
04d3f576b1 Document X11_X11_LIB and X11_X11_INCLUDE_PATH 
Alex
 2009-11-15 13:26:59 -05:00
Alexander Neundorf
0f457937f4 Split some logic of FindQt4.cmake into separate files, which are included automatically. 
Qt4Macros.cmake: all the "public" macros of FindQt4.cmake
Qt4ConfigDependentSettings.cmake: the code for detecting the
Qt-configuration dependent additional libraries, e.g. when linking statically.

There should be no functional changes in this patch.
The patch reduces the length of FindQt4.cmake from 1700 lines to around 1000
lines, which is still long enough, but this should make the file a easier to
handle (and it is similar to what we do in KDE with FindKDE4Internal.cmake
and KDE4Macros.cmake)

Ok by Clinton.

Alex
 2009-11-15 13:02:19 -05:00
Will Dicharry
eb7e4498c4 Fixed parallel HDF5 detection when HDF5_INCLUDE_DIRS has multiple items. 2009-11-13 13:25:05 -05:00
Will Dicharry
3b8cab3a46 Changed HDF5_INCLUDE_DIR to HDF5_INCLUDE_DIRS to conform to standards. 2009-11-13 13:09:38 -05:00
Dave Partyka
3154cde792 BUG: rename MPI_PACKAGE_DIR and MPI_PREFIX_PATH vars to be prefixed with _ to prevent conflicts with known variable names in other projects. 2009-11-13 10:57:01 -05:00
Dave Partyka
279e4ec33b BUG: fix MPI_BASE_DIR var to be called _MPI_BASE_DIR to prevent conflicts with known variable names in other projects. 2009-11-13 10:52:28 -05:00
Bill Hoffman
6e8aa6cb52 Fix regression with CPACK_NSIS_PACKAGE_NAME, if the project is setting the CPACK_NSIS_DISPLAY_NAME then use that as the default value and not the CPACK_PACKAGE_INSTALL_DIRECTORY, also make sure it escapes \ correctly. 2009-11-12 17:58:37 -05:00
Alexander Neundorf
fb8d583054 also search for "qmake-mac", which is installed by macports (http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2) 
Alex
 2009-11-12 12:55:19 -05:00
Eric Noulard
33358ff4ff CPackRPM:: add support for USER specified post/pre [un]install scripts (fix bug 8988) 
Eric
 2009-11-11 15:55:44 -05:00
Eric Noulard
c0814f4155 CPackRPM:: support user supplied "Provides" in spec file (fix bug 9584) 
Eric
 2009-11-11 15:27:44 -05:00
Alexander Neundorf
35a209b0db Search for the header QtAssistant for QT_QTASSISTANT_INCLUDE_DIR instead of QtAssistantClient 
This should not change the result (since both should be in the same
directory), but seems a bit more logical and is also in sync with what is done in the KDE version.

Alex
 2009-11-10 13:57:21 -05:00
Eric Noulard
28f54d0b85 CPackRPM:: Support USER supplied spec files (bug 9679) 
Eric
 2009-11-09 16:17:22 -05:00
Eric Noulard
2362fdc850 Fix CPack bug #9654 
Eric
 2009-11-09 14:06:36 -05:00
Alexander Neundorf
4a2f809124 Sort documentation entries better and move mark_as_advanced() a bit back 
Alex
 2009-11-09 12:55:46 -05:00
Alexander Neundorf
054eed5819 -another tiny sync with KDE4, no functional changes 
Alex
 2009-11-08 13:21:09 -05:00
Alexander Neundorf
e325b1a38a some syncing with FindQt4.cmake from KDE, no functional changes 
-the mark_as_advanced() calls for the variables coming from qmake are now in
the corresponding section, and not in the section where the include dirs are
foudn

Alex
 2009-11-08 13:01:46 -05:00
Bill Hoffman
2fc9c5fb14 Add jom find module 2009-11-06 14:15:36 -05:00
Brad King
56d4619984 Remove non-language implicit link dependencies 
Some compilers use implicit link options of the form

  -lcrt*.o
  -lgcc*
  -lSystem      (on Mac)
  -lSystemStubs (on Mac)

that provide system-wide symbols not specific to any language.
These need not be listed explicitly for mixed-language linking.

We teach CMake to remove the above items from the implicit library list
of each language.  This change makes it possible to mix GNU compiler
versions in some cases.
 2009-11-05 12:17:08 -05:00
Mathieu Malaterre
fdc6638b1c Add more documentation to module 2009-11-04 09:49:58 -05:00
Mathieu Malaterre
b0960683b2 Adding support for java 1.6.0-oem. Make sure to report failure when user ask for version but regex failed to parse version number 2009-11-04 05:17:46 -05:00
James Bigler
b1817590c1 Fix -fPIC from being used on executable object files. 
BUILD_SHARED_LIBS is now only recognized when calling CUDA_ADD_LIBRARY.  If you want the CMAKE_SHARED_LIBRARY_C/CXX_FLAGS to be used, pass SHARED as an argument.  This prevents -fPIC from being used on objects destined for executables by default.
 2009-11-04 01:15:31 -05:00
Mathieu Malaterre
b93b6dc677 Replace FATAL_ERROR with status. Remove output when QUIET is ON 2009-11-03 17:22:57 -05:00
Mathieu Malaterre
59ce04d4f8 STYLE: minor documentation + typo 2009-11-02 11:50:33 -05:00
Mathieu Malaterre
ccb8accc1b BUG: hardcoded path, are not hints. Split the two lists. Thanks Brad 2009-11-02 11:37:16 -05:00
Mathieu Malaterre
ff0ff68967 BUG: To be able to use ENV and at the same time allow /usr/loca/bin to override /usr/bin, apply patch suggested by Hendrik Sattler (thanks) 2009-11-02 09:23:11 -05:00
Mathieu Malaterre
2b071aeb07 ENH: Make those variables advanced. 2009-11-02 09:15:04 -05:00
Mathieu Malaterre
865e0a11b4 BUG: 0009817 cmake does not search in solaris subdirectory for JAVA_INCLUDE_PATH2. Thanks to Gaetan Lehmann for patch 2009-11-02 04:03:06 -05:00
Mathieu Malaterre
0615218bdf STYLE: respect convention (while being backward compat) 2009-10-30 12:17:25 -04:00
Mathieu Malaterre
d25952ee9f FIX: BUG: 0009124. Fix documentation 2009-10-30 12:06:53 -04:00
Mathieu Malaterre
74805dbbbd ENH: FIX 0009777. This should sync FindJava and CMakeDetermineJavaCompiler.cmake now 2009-10-30 11:55:57 -04:00
Mathieu Malaterre
17ad96111b FIX: BUG: 0009804. Update FindDCMTK to look in more paths. Start looking for command line tool: dcmdump/dcmdjpeg/dcmdrle 2009-10-30 11:48:44 -04:00
Mathieu Malaterre
54541d4a47 FIX: BUG: 0008971 FindOpenSSL improvement. Teaches cmake to find openssl on win32. openssl comes with the crypto libs which are the important part of the openssl project. 2009-10-30 11:35:15 -04:00
Mathieu Malaterre
ae27492091 STYLE: Fix documentation (thanks Brad). 2009-10-30 11:22:41 -04:00
Mathieu Malaterre
3d898c2534 FIX: BUG: 0002199 Adding documentation for swig_generated_file_fullname 2009-10-30 11:13:00 -04:00
Mathieu Malaterre
c0ec66b6d7 FIX: BUG: 0007915 Integrate portion of the patch. Also add .pyd support for python module. 2009-10-30 11:07:10 -04:00
Mathieu Malaterre
bb123d0b81 ENH: Update code: 1. In version 1.6.0_17, 17 is now the TWEAK version as per cmake convention. 2. Use VERSION_LESS to compare version, which simplify code 3. Enhance testing, see: https://gdcm.svn.sourceforge.net/svnroot/gdcm/Sandbox/CMakeBug/8/CMakeLists.txt 2009-10-30 10:49:12 -04:00
Mathieu Malaterre
5c594b6f3a FIX: BUG: 0009795 FindJava now respect naming convention and handle VERSION/EXACT. 2009-10-30 04:05:59 -04:00
Will Dicharry
518f9c57b7 Fixed bug in FindHDF5 caused by hdf5.h existing without H5pubconf.h. 2009-10-29 17:18:41 -04:00
Bill Hoffman
e183581b14 Fix for bug #9793 try to make sure jni.h matches jni_md.h 2009-10-29 13:48:32 -04:00
Brad King
537906b467 Fix flags for Intel Fortran on Windows 
We replace "/MD" with ifort-specific flags as follows:

  /MD  -> /threads /libs:dll
  /MDd -> /threads /libs:dll /dbglibs

We also enable the "/MD" equivalent for all Fortran configurations.
Previously multithreaded dll runtimes were used for release builds and
threaded static runtimes for debug builds.  For mixed Fortran C/C++
projects, this led to link warnings for Debug but not for Release.

See issue #8744.
 2009-10-29 10:06:10 -04:00
Bill Hoffman
bc3cab3634 clean up to work with manifest files better. 2009-10-28 10:29:24 -04:00
Bill Hoffman
b3328f7766 Allow this to handle hand edited manifest files. 2009-10-27 16:01:47 -04:00
Dave Partyka
39e88bbe99 COMP: need to add quotes when using get_filename_component otherwise it will try to process NOT FOUND rather than an empty string when MPIEXEC is not found. 2009-10-27 13:10:01 -04:00
Dave Partyka
c283fe2d26 COMP: fix syntax error. 2009-10-27 12:57:30 -04:00
Dave Partyka
4915e92998 ENH: Improvements in finding MPI on windows. ENH: reorganized searching mpi for mpi components (include,lib,bin) using a single set of search paths instead of seperately mainted lists of paths for each. 2009-10-27 12:43:50 -04:00
James Bigler
9605af8c2e Look for nvcc in the 32 bit bin directory before the 64 bin directory. 2009-10-27 12:00:28 -04:00
Brad King
ccdd3e943d Fix Intel Fortran SHARED libraries on Linux 
The Intel Fortran compiler needs options '-i_dynamic' and '-nofor_main'
to create shared libraries on Linux (for at least one architecture).
 2009-10-27 10:50:43 -04:00
Bill Hoffman
7d9e5b88ff Allow for /D to change install directory on the command line. 2009-10-26 17:14:56 -04:00
Brad King
707d05e936 Fix Intel and MinGW Fortran DLL import libraries 
We add Intel and MinGW Fortran linker options to create the import
library portion of a DLL.  This allows other binaries to link to a
Fortran DLL.

We also update the Fortran test to use a .def file to specify exports
since there is no __declspec(dllexport) markup syntax in Fortran.
 2009-10-26 11:07:27 -04:00