anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 07:45:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CMake for r31189.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31204 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-08-22 17:37:56 +00:00
parent 57f1c58598
commit 8326148f69
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/cmake/modules/LyXMacros.cmake
View File

@ -104,10 +104,13 @@ macro(LYX_AUTOMOC)
#set(_header ${_abs_PATH}/${_basename}.h)
set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
if (WIN32)
set(_def -D_WIN32)
endif()
#set(_moc ${_abs_PATH}/${_current_MOC})
add_custom_command(OUTPUT ${_moc}
COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${_moc_INCS} ${_header} -o ${_moc}
ARGS ${_def} ${_moc_INCS} ${_header} -o ${_moc}
MAIN_DEPENDENCY ${_header})
macro_add_file_dependencies(${_abs_FILE} ${_moc})
endforeach (_current_MOC_INC)

2
development/cmake/src/CMakeLists.txt
View File

@ -45,6 +45,8 @@ if (ASPELL_FOUND)
list(APPEND lyx_headers ${TOP_SRC_DIR}/src/AspellChecker.h)
endif()
lyx_automoc(${TOP_SRC_DIR}/src/Server.cpp)
include_directories(${CMAKE_CURRENT_BINARY_DIR}
${ZLIB_INCLUDE_DIR} ${QT_INCLUDES})