Remove moc-files from the set of source files

[lyx.git] / development / cmake / CMakeLists.txt

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index af6a1d0095ae1f8199f57308e2d4a8e257e52eee..65009f0d96d85b1e20746d35a37690347defba0d 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -11,17 +11,20 @@ if(COMMAND cmake_policy)
        cmake_policy(SET CMP0005 OLD)
 endif(COMMAND cmake_policy)
 
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-
 project(lyx)
 
-option(lyxinstall "Build install projects/rules" ON)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
 # is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
 set(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
 
+
+option(lyxinstall "Build install projects/rules" ON)
+
+
+
 # Supress regeneration
 set(CMAKE_SUPPRESS_REGENERATION TRUE)
 
@@ -105,6 +108,7 @@ endif()
 # lyx's source files
 set(LYX_CPP_FILES *.cpp)
 set(LYX_HPP_FILES *.h)
+set(LYX_MOC_FILES moc_*.cpp)
 
 include(LyXMacros)
 include(ProjectSourceGroup)
@@ -165,8 +169,8 @@ if(NOT MSVC)
        if(concept-checks)
                set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
        endif()
-       set(CMAKE_CXX_FLAGS          "${LYX_CXX_FLAGS}" CACHE TYPE STRING FORCE)
-       set(CMAKE_CXX_FLAGS_DEBUG    "${LYX_CXX_FLAGS} -O -g -D_DEBUG" CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS          "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS_DEBUG    "${LYX_CXX_FLAGS} -fno-strict-aliasing -O -g -D_DEBUG" CACHE TYPE STRING FORCE)
        if(MINGW)
                set(CMAKE_CXX_FLAGS_RELEASE  "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE)
        else()
@@ -213,6 +217,21 @@ else()
   message(STATUS "----- Hunspell not found, building without hunspell support")
 endif()
 
+if(WIN32)
+  find_library(ENCHANT_LIBRARY "libenchant")
+  find_path(ENCHANT_INCLUDE_DIR "enchant++.h")
+else()
+  find_library(ENCHANT_LIBRARY "enchant"  "/usr/local/lib" "/usr/lib")
+  find_path(ENCHANT_INCLUDE_DIR "enchant++.h" PATHS /usr/local/include /usr/local/include/enchant /usr/include /usr/include/enchant)
+endif()
+if (ENCHANT_LIBRARY AND ENCHANT_INCLUDE_DIR)
+  set(ENCHANT_FOUND TRUE)
+  add_definitions(-DUSE_ENCHANT=1)
+  message(STATUS "----- Building with USE_ENCHANT")
+else()
+  message(STATUS "----- Enchant not found, building without enchant support")
+endif()
+
 message(STATUS "")
 if(nls OR all)
        set(nls TRUE CACHE TYPE STRING)
@@ -262,29 +281,46 @@ endforeach(_v)
 message(STATUS "")
 
 
-if(MSVC AND NOT disable-pch AND NOT MERGE_FILES)
+# PCHs not supported by cmake: http://www.cmake.org/Bug/view.php?id=1260
+# Not sure if it works for all non-msvc compilers
+include(PCHSupport_26)
+if (MSVC)
+       option(disable-pch "Disable precompiled headers" OFF)
+else()
+       option(disable-pch "Disable precompiled headers" ON)
+endif()
+
+if(NOT disable-pch)
+
        message(STATUS "-----")
        message(STATUS "----- using precompiled headers, disable with -Ddisable-pch=1")
        message(STATUS "-----")
-       configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h
-               ${CMAKE_BINARY_DIR}/pcheaders.h)
-       configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake
-               ${CMAKE_BINARY_DIR}/config_pch.cpp)
-       macro(lyx_add_msvc_pch name_)
-               set_source_files_properties(${${name_}_sources} PROPERTIES
-                       COMPILE_FLAGS "/Yuconfig.h /Fp\$(IntDir)/config.pch")
-               set_source_files_properties(${CMAKE_BINARY_DIR}/config_pch.cpp PROPERTIES
-                       COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch")
-               set(${name_}_sources ${${name_}_sources} ${CMAKE_BINARY_DIR}/config_pch.cpp
-                       ${CMAKE_BINARY_DIR}/pcheaders.h)
-               add_definitions(/DLYX_ENABLE_PCH)
-       endmacro(lyx_add_msvc_pch)
-       set(CMAKE_CXX_FLAGS_DEBUG
-               "${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
-       set(CMAKE_CXX_FLAGS_RELEASE
-               "${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
-       set(CMAKE_CXX_FLAGS_MINSIZEREL
-               "${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST")
+       configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h ${CMAKE_BINARY_DIR}/pcheaders.h)
+       configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake ${CMAKE_BINARY_DIR}/config_pch.cpp)
+       add_definitions(-DLYX_ENABLE_PCH)
+
+       if(MSVC AND NOT MERGE_FILES)
+               macro(lyx_add_msvc_pch name_)
+                       set_source_files_properties(${${name_}_sources} PROPERTIES
+                               COMPILE_FLAGS "/Yuconfig.h /Fp\$(IntDir)/config.pch")
+                       set_source_files_properties(${CMAKE_BINARY_DIR}/config_pch.cpp PROPERTIES
+                               COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch")
+                       set(${name_}_sources ${${name_}_sources} ${CMAKE_BINARY_DIR}/config_pch.cpp
+                               ${CMAKE_BINARY_DIR}/pcheaders.h)
+                       set(CMAKE_CXX_FLAGS_DEBUG       "${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
+                       set(CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
+                       set(CMAKE_CXX_FLAGS_MINSIZEREL  "${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST")                  
+               endmacro(lyx_add_msvc_pch)
+               macro(lyx_add_gcc_pch name_)
+               endmacro()
+       else()
+               macro(lyx_add_msvc_pch name_)
+               endmacro()
+               macro(lyx_add_gcc_pch name_)
+                       add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT4)
+                       ADD_PRECOMPILED_HEADER(${name_} ${CMAKE_BINARY_DIR}/config_pch.cpp ${CMAKE_BINARY_DIR}/config.h.gch)
+               endmacro()
+       endif()
 else()
        if(MSVC)
                message(STATUS "-----")
@@ -294,6 +330,8 @@ else()
        set(disable-pch TRUE CACHE TYPE STRING)
        macro(lyx_add_msvc_pch)
        endmacro(lyx_add_msvc_pch)
+       macro(lyx_add_gcc_pch name_)
+       endmacro()
 endif()
 
 if(MSVC)