diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-21 13:49:39 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-21 13:49:39 +0100 |
| commit | bc35ce59ff5e7df9956159d59bf07512a5a48fd8 (patch) | |
| tree | b8a891299505670b4572a65bb1c7a229c3ab3a8e | |
| parent | 7e42d73b46c1f1f37f0780ba5d009b7daeaba821 (diff) | |
Now everything builds in CMAKE_BUILD_DIR instead of some things in CMAKE_SOURCE_DIR
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | po/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3158b13..5c3925a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,7 @@ IF ( BUNDLE ) SET ( CMAKE_INSTALL_LOCALEDIR share/locale/ ) SET ( CMAKE_INSTALL_ETCDIR etc ) SET ( CMAKE_INSTALL_DOCDIR doc ) - CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${WORKDIR}/base/path.h ) + CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${CMAKE_BINARY_DIR}/src/base/path.h ) ENDIF ( BUNDLE ) ############################################################################### # GETTEXT SUPPORT @@ -200,7 +200,7 @@ MESSAGE ( "CXXflags:${CMAKE_CXX_FLAGS}" ) MESSAGE ( STATUS "<Compiling SRC>" ) MESSAGE ( STATUS "<******************************>" ) IF ( NOT BUNDLE ) - CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${WORKDIR}/base/path.h ) + CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${CMAKE_BINARY_DIR}/src/base/path.h ) ENDIF ( NOT BUNDLE ) ADD_SUBDIRECTORY ( src ) ############################################################################### diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 3a8e055..bc41aed 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -12,13 +12,13 @@ SET ( _gmoFiles ) ############################################################################### FOREACH ( _current_PO_FILE ${_po_files} ) GET_FILENAME_COMPONENT( _lang ${_current_PO_FILE} NAME_WE ) - SET( _gmoFile ${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.gmo ) + SET( _gmoFile ${CMAKE_BINARY_DIR}/po/${_lang}.gmo ) add_custom_command( OUTPUT ${_gmoFile} COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" DEPENDS ${_current_PO_FILE} ) - INSTALL ( FILES ${CMAKE_BINARY_DIR}/${_lang}.gmo + INSTALL ( FILES ${CMAKE_BINARY_DIR}/po/${_lang}.gmo DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${_lang}/LC_MESSAGES/ RENAME tuxanci.mo ) LIST(APPEND _gmoFiles ${_gmoFile}) ENDFOREACH(_current_PO_FILE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0d6cf18..afcf171 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,6 +80,10 @@ SET ( SRC_server ${WORKDIR}/server/highScore ${WORKDIR}/server/publicServer ) ############################################################################### +# INCLUDE CONFIGURED HEADERS +############################################################################### +INCLUDE_DIRECTORIES ( ${CMAKE_BINARY_DIR}/src/base/ ) +############################################################################### # AUDIO CHECK ############################################################################### IF ( WITH_AUDIO ) |