[Tux4kids-commits] r470 - in tuxmath/trunk: macosx src
tholy-guest at alioth.debian.org
tholy-guest at alioth.debian.org
Thu Apr 24 16:51:37 UTC 2008
Author: tholy-guest
Date: 2008-04-24 16:51:37 +0000 (Thu, 24 Apr 2008)
New Revision: 470
Modified:
tuxmath/trunk/macosx/CMakeLists.txt
tuxmath/trunk/src/CMakeLists.txt
Log:
Fixes (hopefully) to the Mac build (thanks to Alex Shorthouse for testing).
Modified: tuxmath/trunk/macosx/CMakeLists.txt
===================================================================
--- tuxmath/trunk/macosx/CMakeLists.txt 2008-04-24 14:52:29 UTC (rev 469)
+++ tuxmath/trunk/macosx/CMakeLists.txt 2008-04-24 16:51:37 UTC (rev 470)
@@ -12,7 +12,12 @@
copyFramework(${SDLTTF_INCLUDE_DIR} ${FRAMEWORK_DEST_DIR})
# Make the disk image
- install(CODE "execute_process(COMMAND hdiutil create -ov -srcfolder ${CMAKE_BINARY_DIR}/src/tuxmath.app -volname TuxMath -imagekey zlib-level=6 ${CMAKE_BINARY_DIR}/TuxMath.dmg)")
- install(CODE "execute_process(COMMAND hdiutil create -ov -srcfolder ${CMAKE_BINARY_DIR}/src/tuxmathadmin.app -volname TuxMathAdmin -imagekey zlib-level=6 ${CMAKE_BINARY_DIR}/TuxMathAdmin.dmg)")
+ install(CODE "file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/macdist)")
+ install(CODE "execute_process(COMMAND mv ${CMAKE_BINARY_DIR}/src/tuxmath.app ${CMAKE_BINARY_DIR}/macdist/)")
+ install(CODE "execute_process(COMMAND mv ${CMAKE_BINARY_DIR}/src/tuxmathadmin ${CMAKE_BINARY_DIR}/macdist/)")
+ #install(CODE "execute_process(COMMAND hdiutil create -ov -srcfolder ${CMAKE_BINARY_DIR}/src/tuxmath.app -volname TuxMath -imagekey zlib-level=6 ${CMAKE_BINARY_DIR}/TuxMath.dmg)")
+ #install(CODE "execute_process(COMMAND hdiutil create -ov -srcfolder ${CMAKE_BINARY_DIR}/src/tuxmathadmin.app -volname TuxMathAdmin -imagekey zlib-level=6 ${CMAKE_BINARY_DIR}/TuxMathAdmin.dmg)")
+ install(CODE "execute_process(COMMAND hdiutil create -ov -srcfolder ${CMAKE_BINARY_DIR}/macdist -volname TuxMath -imagekey zlib-level=6 ${CMAKE_BINARY_DIR}/TuxMath.dmg)")
+
endif (APPLE)
Modified: tuxmath/trunk/src/CMakeLists.txt
===================================================================
--- tuxmath/trunk/src/CMakeLists.txt 2008-04-24 14:52:29 UTC (rev 469)
+++ tuxmath/trunk/src/CMakeLists.txt 2008-04-24 16:51:37 UTC (rev 470)
@@ -41,13 +41,6 @@
message(FATAL_ERROR "SDL not found!")
endif (NOT SDL_FOUND)
-link_libraries (
- ${SDL_LIBRARY}
- ${SDLIMAGE_LIBRARY}
- ${SDLTTF_LIBRARY}
- ${SDLMIXER_LIBRARY}
- )
-
if (NOT APPLE)
link_libraries (SDLmain)
endif (NOT APPLE)
@@ -76,17 +69,22 @@
add_executable (
tuxmathadmin
- MACOSX_BUNDLE
- WIN32
${SOURCES_TUXMATHADMIN}
)
set_target_properties (
tuxmath
PROPERTIES COMPILE_FLAGS
- "-DDATA_PREFIX=\\\"${DATA_PREFIX}\\\" -DVERSION=\\\"${TUXMATH_VERSION}\\\" -DLOCALEDIR=\\\"${LOCALE_DIR}\\\" -DPACKAGE=\\\"tuxmath\\\""
+ "-DDATA_PREFIX=\\\"${TUXMATH_DATA_PREFIX}\\\" -DVERSION=\\\"${TUXMATH_VERSION}\\\" -DLOCALEDIR=\\\"${LOCALE_DIR}\\\" -DPACKAGE=\\\"tuxmath\\\""
)
+target_link_libraries (tuxmath
+ ${SDL_LIBRARY}
+ ${SDLIMAGE_LIBRARY}
+ ${SDLTTF_LIBRARY}
+ ${SDLMIXER_LIBRARY}
+ )
+
if (APPLE)
# The following seems to be needed to compile under 10.5
set_target_properties(tuxmath tuxmathadmin
@@ -97,7 +95,7 @@
set_target_properties (
tuxmathadmin
PROPERTIES COMPILE_FLAGS
- "-DDATA_PREFIX=\\\"${DATA_PREFIX}\\\" -DVERSION=\\\"${TUXMATHADMIN_VERSION}\\\" -DLOCALEDIR=\\\"${LOCALE_DIR}\\\" -DPACKAGE=\\\"tuxmathadmin\\\""
+ "-DDATA_PREFIX=\\\"${TUXMATH_DATA_PREFIX}\\\" -DVERSION=\\\"${TUXMATHADMIN_VERSION}\\\" -DLOCALEDIR=\\\"${LOCALE_DIR}\\\" -DPACKAGE=\\\"tuxmathadmin\\\""
)
## Installation specifications
More information about the Tux4kids-commits
mailing list