[Tux4kids-commits] r1300 - in branches/commonification: tux4kids-common/trunk/src tuxmath/trunk/src

[B. Luchen]

Author: cheezmeister-guest
Date: 2009-07-31 02:01:13 +0000 (Fri, 31 Jul 2009)
New Revision: 1300

Modified:
   branches/commonification/tux4kids-common/trunk/src/CMakeLists.txt
   branches/commonification/tuxmath/trunk/src/CMakeLists.txt
   branches/commonification/tuxmath/trunk/src/SDL_extras.c
Log:
Copy lib & header to tuxmath & tuxtype on install

Modified: branches/commonification/tux4kids-common/trunk/src/CMakeLists.txt
===================================================================
--- branches/commonification/tux4kids-common/trunk/src/CMakeLists.txt	2009-07-31 01:19:04 UTC (rev 1299)
+++ branches/commonification/tux4kids-common/trunk/src/CMakeLists.txt	2009-07-31 02:01:13 UTC (rev 1300)
@@ -9,6 +9,8 @@
 
 
 set( T4KCOMMON_SOURCE_DIR . )
+set( TUXMATH_DESTINATION_DIR ${CMAKE_SOURCE_DIR}/../../tuxmath/trunk/ )
+set( TUXTYPE_DESTINATION_DIR ${CMAKE_SOURCE_DIR}/../../tuxtype/trunk/ )
 
 
 file(GLOB_RECURSE T4KCOMMON_SOURCES ${T4KCOMMON_SOURCE_DIR}/*.c)
@@ -19,6 +21,15 @@
 
 INSTALL( TARGETS t4kcommon
 	ARCHIVE DESTINATION lib )
+INSTALL( TARGETS t4kcommon
+	DESTINATION ${TUXMATH_DESTINATION_DIR}/t4kcommon )
+INSTALL( TARGETS t4kcommon
+	DESTINATION ${TUXTYPE_DESTINATION_DIR}/t4kcommon )
+
 INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/tux4kids-common.h 
 	DESTINATION include/t4kcommon)
+INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/tux4kids-common.h 
+	DESTINATION ${TUXMATH_DESTINATION_DIR}/t4kcommon )
+INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/tux4kids-common.h 
+	DESTINATION ${TUXTYPE_DESTINATION_DIR}/t4kcommon )
 

Modified: branches/commonification/tuxmath/trunk/src/CMakeLists.txt
===================================================================
--- branches/commonification/tuxmath/trunk/src/CMakeLists.txt	2009-07-31 01:19:04 UTC (rev 1299)
+++ branches/commonification/tuxmath/trunk/src/CMakeLists.txt	2009-07-31 02:01:13 UTC (rev 1300)
@@ -144,6 +144,10 @@
    target_link_libraries (tuxmath
    ${T4KCOMMON_LIBRARY}
    )
+else (T4KCOMMON_FOUND)
+   message("Using local t4kcommon")
+   set(CFLAGS ${CFLAGS} -I${TUXMATH_SOURCE_DIR}/t4kcommon)
+   set(LDFLAGS ${LDFLAGS} -L${TUXMATH_SOURCE_DIR}/t4kcommon)
 endif (T4KCOMMON_FOUND)
 
 if (APPLE)

Modified: branches/commonification/tuxmath/trunk/src/SDL_extras.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/SDL_extras.c	2009-07-31 01:19:04 UTC (rev 1299)
+++ branches/commonification/tuxmath/trunk/src/SDL_extras.c	2009-07-31 02:01:13 UTC (rev 1300)
@@ -148,7 +148,7 @@
   SDL_UnlockSurface(s);
 }
 
-#endif
+#endif //HAVE_LIBT4KCOMMON
 
 /**********************
  Flip: