[Playerstage-commit] SF.net SVN: playerstage: [6390] code/player/trunk/libplayercore

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

Revision: 6390
          http://playerstage.svn.sourceforge.net/playerstage/?rev=6390&view=rev
Author:   gbiggs
Date:     2008-04-29 03:46:17 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Cleaned up generating of playerconfig.h

Modified Paths:
--------------
    code/player/trunk/libplayercore/CMakeLists.txt

Added Paths:
-----------
    code/player/trunk/libplayercore/playerconfig.h.in

Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt	2008-04-28 23:38:17 UTC (rev 6389)
+++ code/player/trunk/libplayercore/CMakeLists.txt	2008-04-29 10:46:17 UTC (rev 6390)
@@ -6,18 +6,10 @@
     MESSAGE (FATAL_ERROR "No Python interpreter found. Cannot continue.")
 ENDIF (NOT PYTHONINTERP_FOUND)
 
-# Auto-generate playerconfig.h.  This should be improved
-SET (playerconfig.h "${CMAKE_CURRENT_BINARY_DIR}/playerconfig.h")
-IF (HAVE_STDINT_H)
-  FILE (WRITE ${playerconfig.h}
-"#include <sys/types.h>
-#include <stdint.h>
-")
-ELSE (HAVE_STDINT_H)
-  FILE (WRITE ${playerconfig.h}
-"#include <sys/types.h>
-")
-ENDIF (HAVE_STDINT_H)
+# Auto-generate playerconfig.h.
+SET (playerconfig_h_in "${CMAKE_CURRENT_SOURCE_DIR}/playerconfig.h.in")
+SET (playerconfig_h "${CMAKE_CURRENT_BINARY_DIR}/playerconfig.h")
+CONFIGURE_FILE (${playerconfig_h_in} ${playerconfig_h})
 
 SET (player_interfaces_h "${CMAKE_CURRENT_BINARY_DIR}/player_interfaces.h")
 SET (interface_table_h "${CMAKE_CURRENT_BINARY_DIR}/interface_table.h")
@@ -76,5 +68,5 @@
 
 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
+    interface_util.h message.h playercommon.h ${playerconfig_h} playercore.h player.h
     ${player_interfaces_h} playertime.h plugins.h property.h wallclocktime.h)

Added: code/player/trunk/libplayercore/playerconfig.h.in
===================================================================
--- code/player/trunk/libplayercore/playerconfig.h.in	                        (rev 0)
+++ code/player/trunk/libplayercore/playerconfig.h.in	2008-04-29 10:46:17 UTC (rev 6390)
@@ -0,0 +1,7 @@
+#cmakedefine HAVE_STDINT_H 1
+
+#include <sys/types.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
\ No newline at end of file


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