ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake : Improve error message when font tool is disabled, and add make dist target

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9765 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-09-06 00:15:06 +00:00
parent c4fc2a2bf7
commit 1aa2f7c57e
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
CMakeLists.txt
View File

@ -13,6 +13,7 @@ project(SuperTuxKart)
set(STK_SOURCE_DIR "src") set(STK_SOURCE_DIR "src")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin")
set(PROJECT_VERSION "0.7.3")
# Tweakable values # Tweakable values
if(CMAKE_BUILD_TYPE MATCHES "Debug") if(CMAKE_BUILD_TYPE MATCHES "Debug")
@ -147,22 +148,26 @@ endif()
find_package(Freetype) find_package(Freetype)
if(FREETYPE_FOUND AND FONT_TOOL) if(FONT_TOOL)
message("-- Freetype found") if(FREETYPE_FOUND)
find_package(X11) message("-- Freetype found")
include_directories(${FREETYPE_INCLUDE_DIRS}) find_package(X11)
add_executable(font_tool include_directories(${FREETYPE_INCLUDE_DIRS})
src/font_tool/CFontTool.cpp add_executable(font_tool
src/font_tool/CFontTool.h src/font_tool/CFontTool.cpp
src/font_tool/CVectorFontTool.h src/font_tool/CFontTool.h
src/font_tool/main.cpp src/font_tool/CVectorFontTool.h
) src/font_tool/main.cpp
target_link_libraries(font_tool ${FREETYPE_LIBRARIES}) )
target_link_libraries(font_tool ${X11_Xft_LIB}) target_link_libraries(font_tool ${FREETYPE_LIBRARIES})
target_link_libraries(font_tool ${OPENGL_LIBRARIES}) target_link_libraries(font_tool ${X11_Xft_LIB})
target_link_libraries(font_tool Irrlicht) target_link_libraries(font_tool ${OPENGL_LIBRARIES})
target_link_libraries(font_tool Irrlicht)
else()
message("-- Freetype was not found, the font tool won't be built (only useful for developers)")
endif()
else() else()
message("-- Font tool deactivated/freetype not found, the font tool won't be built (only useful for developers)") message("-- Font tool deactivated, the font tool won't be built (only useful for developers)")
endif() endif()
set( SRCS ${SRCS} src/main.cpp set( SRCS ${SRCS} src/main.cpp
@ -704,3 +709,16 @@ elseif(APPLE)
target_link_libraries(supertuxkart /System/Library/Frameworks/Cocoa.framework) target_link_libraries(supertuxkart /System/Library/Frameworks/Cocoa.framework)
target_link_libraries(supertuxkart /System/Library/Frameworks/OpenGL.framework) target_link_libraries(supertuxkart /System/Library/Frameworks/OpenGL.framework)
endif() endif()
# Make dist target
add_custom_target(dist
COMMAND rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION} && rm -f ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2
&& echo "Exporting..."
&& svn export ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
&& echo "Compressing..."
&& cd ${CMAKE_BINARY_DIR}
&& tar -cjf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}.tar.bz2 ./SuperTuxKart-${PROJECT_VERSION}
&& echo "Done, cleaning up"
&& rm -rf ${CMAKE_BINARY_DIR}/SuperTuxKart-${PROJECT_VERSION}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})