Formatting cleanup of cmake files.

This commit is contained in:
Mark de Wever 2011-01-16 10:31:25 +00:00
parent 4e4f42d60c
commit 2b9ddcea2c
6 changed files with 87 additions and 83 deletions

View file

@ -1,21 +1,21 @@
SET(MANPAGES)
set(MANPAGES)
if(ENABLE_GAME)
SET(MANPAGES ${MANPAGES} wesnoth.6)
set(MANPAGES ${MANPAGES} wesnoth.6)
endif()
if(ENABLE_SERVER)
SET(MANPAGES ${MANPAGES} wesnothd.6)
set(MANPAGES ${MANPAGES} wesnothd.6)
endif()
set(ALL_MANPAGES wesnoth.6 wesnothd.6)
foreach(MANPAGE ${MANPAGES})
install(FILES ${MANPAGE} DESTINATION "${MANDIR}/man6/")
install(FILES ${MANPAGE} DESTINATION "${MANDIR}/man6/")
if(ENABLE_NLS)
foreach(LANG ${LINGUAS})
install(FILES ${LANG}/${MANPAGE} DESTINATION "${MANDIR}/${LANG}/man6/" OPTIONAL)
endforeach(LANG ${LINGUAS})
endif(ENABLE_NLS)
if(ENABLE_NLS)
foreach(LANG ${LINGUAS})
install(FILES ${LANG}/${MANPAGE} DESTINATION "${MANDIR}/${LANG}/man6/" OPTIONAL)
endforeach(LANG ${LINGUAS})
endif(ENABLE_NLS)
endforeach(MANPAGE ${MANPAGES})
if(ENABLE_POT_UPDATE_TARGET)

View file

@ -1,13 +1,15 @@
set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM true)
install(FILES manual.en.html DESTINATION "${DOCDIR}")
install(DIRECTORY images styles DESTINATION "${DOCDIR}"
PATTERN ".svn" EXCLUDE )
install(DIRECTORY images styles
DESTINATION "${DOCDIR}"
PATTERN ".svn" EXCLUDE
)
if(ENABLE_NLS)
foreach(LANG ${LINGUAS})
install(FILES manual.${LANG}.html DESTINATION "${DOCDIR}" OPTIONAL)
endforeach(LANG ${LINGUAS})
foreach(LANG ${LINGUAS})
install(FILES manual.${LANG}.html DESTINATION "${DOCDIR}" OPTIONAL)
endforeach(LANG ${LINGUAS})
endif(ENABLE_NLS)
@ -16,7 +18,7 @@ if(ENABLE_POT_UPDATE_TARGET)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/manual.en.xml
COMMAND ${CMAKE_COMMAND} -E remove manual.en.xml
COMMAND ${CMAKE_COMMAND} -E remove manual.en.html
COMMAND ${CMAKE_COMMAND} -E remove manual.en.html
COMMAND ${ASCIIDOC_EXECUTABLE} ${ASCIIDOC_OPTIONS}
-o manual.en.xml
manual.txt

View file

@ -6,31 +6,31 @@ add_custom_target(update-po4a)
# The normal domains use cpp and cfg files.
set(NORMAL_DOMAINS
wesnoth
wesnoth-anl
wesnoth-aoi
wesnoth-did
wesnoth-dm
wesnoth-dw
wesnoth-editor
wesnoth-ei
wesnoth-help
wesnoth-httt
wesnoth-l
wesnoth-lib
wesnoth-low
wesnoth-multiplayer
wesnoth-nr
wesnoth-sof
wesnoth-sotbe
wesnoth-tb
wesnoth-test
wesnoth-thot
wesnoth-trow
wesnoth-tsg
wesnoth-tutorial
wesnoth-units
wesnoth-utbs
wesnoth
wesnoth-anl
wesnoth-aoi
wesnoth-did
wesnoth-dm
wesnoth-dw
wesnoth-editor
wesnoth-ei
wesnoth-help
wesnoth-httt
wesnoth-l
wesnoth-lib
wesnoth-low
wesnoth-multiplayer
wesnoth-nr
wesnoth-sof
wesnoth-sotbe
wesnoth-tb
wesnoth-test
wesnoth-thot
wesnoth-trow
wesnoth-tsg
wesnoth-tutorial
wesnoth-units
wesnoth-utbs
)
# All available domains.
@ -125,7 +125,7 @@ if(ENABLE_POT_UPDATE_TARGET)
--sort-by-file
${PROJECT_SOURCE_DIR}/po/${DOMAIN}/${DOMAIN}.cpp.pot
${PROJECT_SOURCE_DIR}/po/${DOMAIN}/${DOMAIN}.wml.pot
--output ${PROJECT_SOURCE_DIR}/po/${DOMAIN}/${DOMAIN}.pot
--output ${PROJECT_SOURCE_DIR}/po/${DOMAIN}/${DOMAIN}.pot
COMMAND ${CMAKE_COMMAND} -E remove
${PROJECT_SOURCE_DIR}/po/${DOMAIN}/${DOMAIN}.cpp.pot

View file

@ -83,7 +83,7 @@ set(game-external-libs
${PANGOCAIRO_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${LIBDBUS_LIBRARIES}
${LIBINTL_LIBRARIES}
${LIBINTL_LIBRARIES}
)
if(MSVC)
@ -237,8 +237,8 @@ endif(SVNVERSION_EXECUTABLE)
########### libwesnoth-lua ###############
set(libwesnoth-lua_STAT_SRC
lua/lapi.c
lua/lcode.c
lua/lapi.c
lua/lcode.c
lua/ldebug.c
lua/ldo.c
lua/ldump.c
@ -677,8 +677,8 @@ if(ENABLE_GAME)
)
target_link_libraries(wesnoth
${wesnoth_LIB}
${game-external-libs}
${wesnoth_LIB}
${game-external-libs}
)
set_target_properties(wesnoth
PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}wesnoth${BINARY_SUFFIX}

View file

@ -2,20 +2,20 @@
cmake_minimum_required(VERSION 2.6)
project( ana )
project(ana)
add_subdirectory( src )
add_subdirectory(src)
option( apps "Compile sample applications as well" OFF )
option(apps "Compile sample applications as well" OFF)
if ( apps )
message ( STATUS "Compiling sample applications as well." )
add_subdirectory( apps )
endif ( apps )
if(apps)
message(STATUS "Compiling sample applications as well.")
add_subdirectory( apps )
endif(apps)
option( tests "Compile test applications as well" OFF )
option(tests "Compile test applications as well" OFF)
if ( tests )
message ( STATUS "Compiling test applications as well." )
add_subdirectory( test )
endif ( tests )
if(tests)
message(STATUS "Compiling test applications as well.")
add_subdirectory(test)
endif(tests)

View file

@ -1,38 +1,40 @@
# $Id$
include_directories( ../api )
include_directories(../api)
find_package( Boost 1.35 REQUIRED COMPONENTS thread system)
find_package(Boost 1.35 REQUIRED COMPONENTS thread system)
set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3" )
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3")
set ( common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp )
set(common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp)
set ( server_srcs asio_server.cpp )
set(server_srcs asio_server.cpp)
set ( client_srcs asio_client.cpp asio_proxy_connection.cpp )
set(client_srcs asio_client.cpp asio_proxy_connection.cpp)
add_library( ana SHARED ${server_srcs} ${client_srcs} ${common_srcs} )
add_library( ana-static STATIC ${server_srcs} ${client_srcs} ${common_srcs} )
add_library( ana SHARED ${server_srcs} ${client_srcs} ${common_srcs})
add_library( ana-static STATIC ${server_srcs} ${client_srcs} ${common_srcs})
target_link_libraries( ana ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} )
target_link_libraries( ana-static ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} )
target_link_libraries( ana ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
target_link_libraries( ana-static ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
set ( CMAKE_INSTALL_PREFIX /usr/local )
set(CMAKE_INSTALL_PREFIX /usr/local)
IF(NOT MSVC)
set ( CMAKE_INSTALL_PREFIX /usr/local )
install ( TARGETS ana LIBRARY DESTINATION lib )
install ( TARGETS ana-static ARCHIVE DESTINATION lib )
ENDIF(NOT MSVC)
if(NOT MSVC)
set(CMAKE_INSTALL_PREFIX /usr/local)
install(TARGETS ana LIBRARY DESTINATION lib)
install(TARGETS ana-static ARCHIVE DESTINATION lib)
endif(NOT MSVC)
set ( ana_headers ../api/ana.hpp
../api/common.hpp
../api/timers.hpp
../api/buffers.hpp
../api/predicates.hpp
../api/binary_streams.hpp )
set(ana_headers
../api/ana.hpp
../api/common.hpp
../api/timers.hpp
../api/buffers.hpp
../api/predicates.hpp
../api/binary_streams.hpp
)
IF(NOT MSVC)
install ( FILES ${ana_headers} DESTINATION include/ana )
ENDIF(NOT MSVC)
if(NOT MSVC)
install(FILES ${ana_headers} DESTINATION include/ana)
endif(NOT MSVC)