Yikes!
I just realised that while I put all the CMakeLists.txt files on the
branch, I didn't put the FindXXX.cmake files in the branch! This
explains all the work that Peter has done (has needed to do) to those
files.
What would be the best option:
- revert the main branch to what it was before I accidently committed
the 1.4 changes to FindXXX.cmake files, and put the changes on the
branch, where they belong, or
- leave the current ones as is, and do all future changes on the
branch?
I'd say the first option has the best chance of working, since the
some of the dashboard builds don't use 1.4.
*me hangs his head in shame*
Amitha.
On Sun, Jun 23, 2002 at 08:21:23PM -0400, Wheeler, Fred (Research) wrote:
> Here is an explanation of some recent changes to several FindXXX.cmake files.
>
> In v3p/png/CMakeLists.txt the following command is used:
> TARGET_LINK_LIBRARIES( png ${ZLIB_LIBRARIES} )
> but ZLIB_LIBRARIES was not set anywhere yet. (Not set or references
> anywhere else in the tree.)
>
> This line (and others like it) ends up in CMakeCache.txt
> png_LIB_DEPENDS:STATIC=zlib;${ZLIB_LIBRARIES};
> I'm getting this with cmake 1.4 beta in Cygwin, and NMake/msvc, and
> with the latest cmake cvs in Cygwin. I would have thought that the
> TARGET_LINK_LIBRARIES command with an unset ZLIB_LIBRARIES argument
> would have no effect.
>
> I added SET( ZLIB_LIBRARIES zlib ) to FindZLIB, and made similar
> changes in other FindXXX Module files.
>
> The ${ZLIB_LIBRARIES} ends up on the link line. NMake issues an error when you use ${} instead of
> $(). GNU make is more forgiving.
>
> Here is a portion of a link line from a CMake produced GNU makefile
>
> -lnetlib ${NETLIB_LIBRARIES} -lvil -lvgui_glut -lvgl -lvbl -lQv -lopengl32 -lglut32 -lglu32
> ${QV_LIBRARIES} ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} -ltiff -lpng -lzlib ${ZLIB_LIBRARIES} -ljpeg
> ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} -lvcl -lm -o dbme_gui
>
> Here is a portion of a link line from a CMake produced NMake makefile:
>
> netlib$(CMAKE_STATICLIB_SUFFIX) ${NETLIB_LIBRARIES}$(CMAKE_STATICLIB_SUFFIX)
> vbl$(CMAKE_STATICLIB_SUFFIX) Qv$(CMAKE_STATICLIB_SUFFIX) ${QV_LIBRARIES}$(CMAKE_STATICLIB_SUFFIX)
> ${OPENGL_LIBRARIES}$(CMAKE_STATICLIB_SUFFIX) tiff$(CMAKE_STATICLIB_SUFFIX)
> png$(CMAKE_STATICLIB_SUFFIX) zlib$(CMAKE_STATICLIB_SUFFIX) ${ZLIB_LIBRARIES}$(CMAKE_STATICLIB_SUFFIX)
> jpeg$(CMAKE_STATICLIB_SUFFIX) ${TIFF_LIBRARIES}$(CMAKE_STATICLIB_SUFFIX)
> ${PNG_LIBRARIES}$(CMAKE_STATICLIB_SUFFIX) ${JPEG_LIBRARIES}$(CMAKE_STATICLIB_SUFFIX) ws2_32.lib
> $(CMAKE_STANDARD_WINDOWS_LIBRARIES)
>
|