minizip fixes for msvc and cmake

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index f237098c4e140eb18e147d166c9f0ae521e98947..9e1b41fb77366eda165335db083526651533ed78 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -14,8 +14,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
 set (EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
 
 set(PACKAGE lyx)
-set(PACKAGE_VERSION 1.5.0)
-set(LYX_DATE "July, 2007")
+set(PACKAGE_VERSION 1.5.1)
+set(LYX_DATE "August, 2007")
 #TODO
 set(VERSION_INFO "CMake Build")
 
@@ -98,10 +98,7 @@ endif(UNIX)
 set(qt_postfix qt4)
 project(lyx-${qt_postfix})
 find_package(Qt4 REQUIRED)
-# maybe anyway
-if(MERGE_FILES)
-       add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
-endif(MERGE_FILES)
+add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
 
 find_package(ZLIB REQUIRED)