From 1f2456132e1c3a75473dfea30d26c6cff8d8257c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 6 Feb 2005 00:17:50 +0000 Subject: Cmake updates (STR #645) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/CMakeLists.txt | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 84c9f26ce..733858112 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -161,11 +161,11 @@ SET(CFILES vsnprintf.c ) -# We need ansi c-flags, especially on HP -SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}") -SET(CMAKE_REQUIRED_FLAGS ${CMAKE_ANSI_CFLAGS}) - ADD_LIBRARY(fltk ${CPPFILES} ${CFILES}) +SET_TARGET_PROPERTIES(fltk + PROPERTIES + VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} + SOVERSION ${FLTK_VERSION_PATCH}) TARGET_LINK_LIBRARIES(fltk ${FLTK_PLATFORM_DEPENDENT_LIBS} ${CMAKE_THREAD_LIBS_INIT}) @@ -176,13 +176,25 @@ ENDIF(X11_FOUND) IF(OPENGL_FOUND) ADD_LIBRARY(fltk_gl ${GLCPPFILES}) TARGET_LINK_LIBRARIES(fltk_gl fltk ${OPENGL_LIBRARIES}) + SET_TARGET_PROPERTIES(fltk_gl + PROPERTIES + VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} + SOVERSION ${FLTK_VERSION_PATCH}) ENDIF(OPENGL_FOUND) ADD_LIBRARY(fltk_forms ${FLCPPFILES}) TARGET_LINK_LIBRARIES(fltk_forms fltk) +SET_TARGET_PROPERTIES(fltk_forms + PROPERTIES + VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} + SOVERSION ${FLTK_VERSION_PATCH}) ADD_LIBRARY(fltk_images ${IMGCPPFILES}) TARGET_LINK_LIBRARIES(fltk_images fltk) +SET_TARGET_PROPERTIES(fltk_images + PROPERTIES + VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} + SOVERSION ${FLTK_VERSION_PATCH}) IF(HAVE_LIBPNG) TARGET_LINK_LIBRARIES(fltk_images ${PNG_LIBRARIES}) @@ -191,3 +203,8 @@ ENDIF(HAVE_LIBPNG) IF(HAVE_LIBJPEG) TARGET_LINK_LIBRARIES(fltk_images ${JPEG_LIBRARIES}) ENDIF(HAVE_LIBJPEG) + +INSTALL_TARGETS(/lib fltk) +INSTALL_TARGETS(/lib fltk_gl) +INSTALL_TARGETS(/lib fltk_forms) +INSTALL_TARGETS(/lib fltk_images) -- cgit v1.2.3