[Playerstage-commit] SF.net SVN: playerstage: [4449] code/player/branches/cmake

[<gb...@us...>]

Revision: 4449
          http://playerstage.svn.sourceforge.net/playerstage/?rev=4449&view=rev
Author:   gbiggs
Date:     2008-03-26 19:47:42 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Install header files

Modified Paths:
--------------
    code/player/branches/cmake/CMake_Todo.txt
    code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt
    code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt
    code/player/branches/cmake/cmake/internal/LibraryUtils.cmake
    code/player/branches/cmake/cmake/internal/SetupDirectories.cmake
    code/player/branches/cmake/libplayercore/CMakeLists.txt
    code/player/branches/cmake/libplayerjpeg/CMakeLists.txt
    code/player/branches/cmake/libplayersd/CMakeLists.txt
    code/player/branches/cmake/libplayertcp/CMakeLists.txt
    code/player/branches/cmake/libplayerxdr/CMakeLists.txt
    code/player/branches/cmake/server/libplayerdrivers/CMakeLists.txt

Modified: code/player/branches/cmake/CMake_Todo.txt
===================================================================
--- code/player/branches/cmake/CMake_Todo.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/CMake_Todo.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -8,8 +8,6 @@
 - all those driver make files
 - examples dir (probably easy) - just need to do the make files for compiling outside the source tree now
 - dist tarballs, packages, etc - add in the extra_dist files to the source one
-- Fix the checks for boost threads and boost signals libraries
+. Fix the checks for boost threads and boost signals libraries - possibly a better version of FindBoost is coming in 2.6, defer till then (http://www.cmake.org/Bug/view.php?id=6257)
 - Some installable cmake modules with macros for making plugin drivers, etc
-- Install header files!
-- Do any of the generated files need to be installed (e.g. generated config.h)?
 - Clean out/replace any stragglers from autotools (including README and co)
\ No newline at end of file

Modified: code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -62,4 +62,6 @@
     TARGET_LINK_LIBRARIES (playerc ${GEOS_LIBS})
 ENDIF (HAVE_GEOS)
 
+PLAYER_INSTALL_HEADERS (playerc playerc.h)
+
 PLAYER_MAKE_PKGCONFIG ("playerc" "Andrew Howard's Player C client library - part of the Player Project" "playerxdr playererror" "" "" "-lm")
\ No newline at end of file

Modified: code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -2,15 +2,16 @@
 
 OPTION (BUILD_PLAYERCC "Build the C++ client library" ON)
 IF (BUILD_PLAYERCC)
-    SET (boostLibs)
     # Look for Boost libraries
     SET (boostLinkLibs)
     FIND_PACKAGE (Boost)
     IF (Boost_FOUND)
-        SET (HAVE_BOOST_THREAD TRUE)
-#         CHECK_LIBRARY_EXISTS (boost_thread "" "" HAVE_BOOST_THREAD)
+        # TODO: there may be a new, much better, FindBoost.cmake coming in 2.6
+        # For now, assume that if boost is found then both signals and threads are present
+        SET (HAVE_BOOST_THREAD TRUE INTERNAL)
         IF (HAVE_BOOST_THREAD)
             OPTION (USE_BOOST_THREADS "Use the Boost threading library" ON)
+            MARK_AS_ADVANCED (USE_BOOST_THREADS)
             IF (USE_BOOST_THREADS)
                 MESSAGE (STATUS "PlayerC++ client library will be built with Boost::Thread support.")
                 PLAYERCC_ADD_LINK_LIB (boost_thread)
@@ -25,10 +26,10 @@
             MESSAGE (STATUS "PlayerC++ client library Boost::Thread support disabled - Boost::Thread library not found.")
         ENDIF (HAVE_BOOST_THREAD)
 
-#         CHECK_LIBRARY_EXISTS (boost_signals lock "" HAVE_BOOST_SIGNALS)
-        SET (HAVE_BOOST_SIGNALS TRUE)
+        SET (HAVE_BOOST_SIGNALS TRUE INTERNAL)
         IF (HAVE_BOOST_SIGNALS)
             OPTION (USE_BOOST_SIGNALS "Use the Boost signalling library" ON)
+            MARK_AS_ADVANCED (USE_BOOST_SIGNALS)
             IF (USE_BOOST_SIGNALS)
                 MESSAGE (STATUS "PlayerC++ client library will be built with Boost::Signals support.")
                 PLAYERCC_ADD_LINK_LIB (boost_signals)
@@ -99,4 +100,6 @@
     PLAYER_ADD_LIBRARY (playerc++ ${playerccSrcs})
     TARGET_LINK_LIBRARIES (playerc++ playerxdr playerutils playerc ${PLAYERCC_EXTRA_LINK_LIBRARIES})
     PLAYER_MAKE_PKGCONFIG ("playerc++" "C++ wrapper for libplayerc - part of the Player Project" "playerxdr playerc" "" "" "-lm ${boostLinkLibs}")
+
+    PLAYER_INSTALL_HEADERS (playerc++ clientproxy.h playerc++.h playerclient.h playererror.h utility.h)
 ENDIF (BUILD_PLAYERCC)
\ No newline at end of file

Modified: code/player/branches/cmake/cmake/internal/LibraryUtils.cmake
===================================================================
--- code/player/branches/cmake/cmake/internal/LibraryUtils.cmake	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/cmake/internal/LibraryUtils.cmake	2008-03-27 02:47:42 UTC (rev 4449)
@@ -77,4 +77,13 @@
 
     CONFIGURE_FILE (${PLAYER_CMAKE_DIR}/pkgconfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc @ONLY)
     INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc DESTINATION lib/pkgconfig/)
-ENDMACRO (PLAYER_MAKE_PKGCONFIG _name _desc _extDeps _intDeps _cFlags _libFlags)
\ No newline at end of file
+ENDMACRO (PLAYER_MAKE_PKGCONFIG _name _desc _extDeps _intDeps _cFlags _libFlags)
+
+
+###############################################################################
+# PLAYER_INSTALL_HEADERS
+# Installs header files
+MACRO (PLAYER_INSTALL_HEADERS _subdir)
+    INSTALL (FILES ${ARGN}
+        DESTINATION ${PLAYER_INCLUDE_INSTALL_DIR}/${_subdir})
+ENDMACRO (PLAYER_INSTALL_HEADERS _subdir)

Modified: code/player/branches/cmake/cmake/internal/SetupDirectories.cmake
===================================================================
--- code/player/branches/cmake/cmake/internal/SetupDirectories.cmake	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/cmake/internal/SetupDirectories.cmake	2008-03-27 02:47:42 UTC (rev 4449)
@@ -5,4 +5,8 @@
     SET (CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation directory")
 ENDIF (PLAYER_OS_WIN)
 
-MESSAGE (STATUS "Player will be installed to ${CMAKE_INSTALL_PREFIX}")
\ No newline at end of file
+MESSAGE (STATUS "Player will be installed to ${CMAKE_INSTALL_PREFIX}")
+
+# Installation prefix for include files
+STRING (TOLOWER ${PROJECT_NAME} projectNameLower)
+SET (PLAYER_INCLUDE_INSTALL_DIR "include/${projectNameLower}-${PLAYER_MAJOR_VERSION}.${PLAYER_MINOR_VERSION}")
\ No newline at end of file

Modified: code/player/branches/cmake/libplayercore/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayercore/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/libplayercore/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -49,4 +49,9 @@
 SET (playerutils_srcs   interface_util.c
                         addr_util.c)
 PLAYER_ADD_LIBRARY (playerutils ${playerutils_srcs} ${interface_table_h})
-PLAYER_MAKE_PKGCONFIG ("playerutils" "Player utilities library - part of the Player Project" "" "" "" "")
\ No newline at end of file
+PLAYER_MAKE_PKGCONFIG ("playerutils" "Player utilities library - part of the Player Project" "" "" "" "")
+
+PLAYER_INSTALL_HEADERS (playercore
+    addr_util.h configfile.h device.h devicetable.h driver.h drivertable.h error.h globals.h
+    interface_util.h message.h playercommon.h playerconfig.h playercore.h player.h
+    ${player_interfaces_h} playertime.h plugins.h property.h wallclocktime.h)
\ No newline at end of file

Modified: code/player/branches/cmake/libplayerjpeg/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayerjpeg/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/libplayerjpeg/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -2,4 +2,5 @@
 
 PLAYER_ADD_LIBRARY (playerjpeg ${playerjpegSrcs})
 TARGET_LINK_LIBRARIES (jpeg)
-PLAYER_ADD_LINK_LIB (jpeg)
\ No newline at end of file
+PLAYER_ADD_LINK_LIB (jpeg)
+PLAYER_INSTALL_HEADERS (playerjpeg playerjpeg.h)
\ No newline at end of file

Modified: code/player/branches/cmake/libplayersd/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayersd/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/libplayersd/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -9,4 +9,6 @@
     TARGET_LINK_LIBRARIES (playersd playererror playerutils)
     PLAYER_ADD_LINK_LIB (dns_sd)
     PLAYER_MAKE_PKGCONFIG ("playersd" "Player service discovery library - part of the Player Project" "playererror playerutils" "" "" "-ldns_sd -lpthread")
+
+    PLAYER_INSTALL_HEADERS (playersd playersd.h)
 ENDIF (HAVE_PLAYERSD)
\ No newline at end of file

Modified: code/player/branches/cmake/libplayertcp/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayertcp/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/libplayertcp/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -12,6 +12,8 @@
     TARGET_LINK_LIBRARIES (playertcp z)
     PLAYER_ADD_LINK_LIB (z)
     PLAYER_MAKE_PKGCONFIG ("playertcp" "Player TCP messaging library - part of the Player Project" "playererror playercore" "" "" "")
+
+    PLAYER_INSTALL_HEADERS (playertcp playertcp.h)
 ENDIF (INCLUDE_TCP)
 
 IF (INCLUDE_UDP)
@@ -19,4 +21,6 @@
     PLAYER_ADD_LIBRARY (playerudp ${playerudpSrcs})
     TARGET_LINK_LIBRARIES (playerudp replace playercore playererror playerutils playerxdr)
     PLAYER_MAKE_PKGCONFIG ("playerudp" "Player UDP messaging library - part of the Player Project" "playererror playercore" "" "" "")
+
+    PLAYER_INSTALL_HEADERS (playertcp playerudp.h)
 ENDIF (INCLUDE_UDP)
\ No newline at end of file

Modified: code/player/branches/cmake/libplayerxdr/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayerxdr/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/libplayerxdr/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -35,4 +35,6 @@
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
 PLAYER_ADD_LIBRARY (playerxdr ${playerxdrSrcs})
 SET_SOURCE_FILES_PROPERTIES (${playerxdr_h} ${playerxdr_c} PROPERTIES GENERATED TRUE)
-PLAYER_MAKE_PKGCONFIG ("playerxdr" "Player XDR messaging library - part of the Player Project" "" "" "" "")
\ No newline at end of file
+PLAYER_MAKE_PKGCONFIG ("playerxdr" "Player XDR messaging library - part of the Player Project" "" "" "" "")
+
+PLAYER_INSTALL_HEADERS (playerxdr ${playerxdr_h} functiontable.h)
\ No newline at end of file

Modified: code/player/branches/cmake/server/libplayerdrivers/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/server/libplayerdrivers/CMakeLists.txt	2008-03-27 02:23:15 UTC (rev 4448)
+++ code/player/branches/cmake/server/libplayerdrivers/CMakeLists.txt	2008-03-27 02:47:42 UTC (rev 4449)
@@ -60,4 +60,6 @@
 ENDIF (PLAYER_DRIVERSLIB_LINKFLAGS)
 
 # Package config file for libplayerdrivers
-PLAYER_MAKE_PKGCONFIG ("playerdrivers" "Player driver library - part of the Player Project" "playercore" "" "" "-lpthread")
\ No newline at end of file
+PLAYER_MAKE_PKGCONFIG ("playerdrivers" "Player driver library - part of the Player Project" "playercore" "" "" "-lpthread")
+
+PLAYER_INSTALL_HEADERS (playerdrivers driverregistry.h)
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.