add varrho, patch from hzluo <memcache@gmail.com>

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 132391a821c9f519d630e4b9f037cf144c13887c..e09111ab389c9c746c2a854170ce4bed4f72a252 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -21,6 +21,8 @@ set(VERSION_INFO "CMake Build")
 
 if(WIN32)
        set(USE_WINDOWS_PACKAGING 1)
+elseif(APPLE)
+       set(USE_MACOSX_PACKAGING 1)
 else(WIN32)
        set(USE_POSIX_PACKAGING 1)
 endif(WIN32)
@@ -31,7 +33,7 @@ if(NOT GROUP_CODE)
 endif(NOT GROUP_CODE)
 
 # lyx's source files
-set(LYX_CPP_FILES *.C)
+set(LYX_CPP_FILES *.cpp)
 set(LYX_HPP_FILES *.h)
 
 include(LyXPaths)
@@ -42,7 +44,7 @@ if(merge)
        set(merge 1 CACHE TYPE STRING FORCE)
        set(MERGE_FILES 1 CACHE TYPE STRING FORCE)
        message(STATUS "")
-       message(STATUS "will merge all *.C files of a project into two files, disable with -Dmerge=0")
+       message(STATUS "will merge all *.cpp files of a project into two files, disable with -Dmerge=0")
        message(STATUS "")
        set(disable-pch  1)
 else(merge)
@@ -252,3 +254,7 @@ include_directories(
 add_subdirectory(boost)
 add_subdirectory(intl)
 add_subdirectory(src)
+
+
+include(../Install)
+