Fix CMake for r31189.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31204 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index 37b612b83bf15fa7632c7159938319e8e61d33a5..a064bec034038a213d9dd6a24e9a8dea5a9f1179 100644 (file)
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -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)

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 89786426da7a858bfb1e61c1072ca16be6bbe8cc..76c1a3557a4eeb286a2a0841a63f4c4158678b67 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -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})