The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit acddee2465f2178ea97efcb2cd35a33ce5ec1217
Author: Kornel Benko <kor...@lyx.org>
Date: Tue Oct 9 22:43:24 2012 +0200
Cmake build: Define for 'DEVEL_VERSION' already done in
development/cmake/config.h.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3f3ebe9..efa8d01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,11 +72,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
lyx_add_msvc_pch(lyx)
-if (LYX_DEVEL_VERSION)
- add_definitions(-DDEVEL_VERSION)
-endif()
-
-
if (LYX_MERGE_FILES)
if(dont_merge)
list(REMOVE_ITEM lyx_sources ${dont_merge})
commit fdc2f0c78d498de92ebc8828002c43a64ef3b9e7
Author: Kornel Benko <kor...@lyx.org>
Date: Tue Oct 9 22:42:06 2012 +0200
Cmake build: Define for 'USE_ENCHANT' already done in
development/cmake/config.h.cmake
diff --git a/development/cmake/modules/FindEnchant.cmake
b/development/cmake/modules/FindEnchant.cmake
index 3abc2b6..d4164b6 100644
--- a/development/cmake/modules/FindEnchant.cmake
+++ b/development/cmake/modules/FindEnchant.cmake
@@ -16,7 +16,6 @@ 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")
-----------------------------------------------------------------------
Summary of changes:
development/cmake/modules/FindEnchant.cmake | 1 -
src/CMakeLists.txt | 5 -----
2 files changed, 0 insertions(+), 6 deletions(-)
hooks/post-receive
--
The LyX Source Repository
