blob: c07558d00a3a5141faf7434f88e7af40dc6f8beb (
plain)
1 diff -Naur clucene-core-2.3.3.4-old/CMakeLists.txt clucene-core-2.3.3.4/CMakeLists.txt
2 --- clucene-core-2.3.3.4-old/CMakeLists.txt 2018-12-30 01:11:38.564342744 +0100
3 +++ clucene-core-2.3.3.4/CMakeLists.txt 2018-12-30 01:11:48.033493007 +0100
4 @@ -13,7 +13,7 @@
5 #Must be incremented for releases if the api is not backwards compatible
6 SET(CLUCENE_SOVERSION "1")
7
8 -MATH(EXPR CLUCENE_INT_VERSION "(${CLUCENE_VERSION_MAJOR} * 1000000) + (${CLUCENE_VERSION_MINOR} * 10000) + (${CLUCENE_VERSION_REVISION} * 100) + (${CLUCENE_VERSION_PATCH} * 1)" )
9 +#MATH(EXPR CLUCENE_INT_VERSION "(${CLUCENE_VERSION_MAJOR} * 1000000) + (${CLUCENE_VERSION_MINOR} * 10000) + (${CLUCENE_VERSION_REVISION} * 100) + (${CLUCENE_VERSION_PATCH} * 1)" )
10 SET(CLUCENE_VERSION "${CLUCENE_VERSION_MAJOR}.${CLUCENE_VERSION_MINOR}.${CLUCENE_VERSION_REVISION}.${CLUCENE_VERSION_PATCH}")
11
12 #CMake 2.6+ is recommended to an improved Boost module
13 @@ -60,11 +60,11 @@
14 OPTION(ENABLE_ASCII_MODE
15 "enable ascii support"
16 OFF)
17 -
18 +
19 SET(ENABLE_ANSI_MODE OFF)
20 IF(CMAKE_COMPILER_IS_GNUCXX)
21 SET(ENABLE_ANSI_MODE ON)
22 -
23 +
24 #exceptions:
25 IF(MINGW OR CYGWIN)
26 SET(ENABLE_ANSI_MODE OFF)
27 @@ -123,7 +123,7 @@
28 SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pg")
29 ENDIF ( ENABLE_GPROF )
30 ENDIF ( GccFlagPg )
31 -
32 +
33 IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
34 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
35 ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
36 @@ -131,7 +131,7 @@
37 IF( ENABLE_ANSI_MODE )
38 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
39 ENDIF ( ENABLE_ANSI_MODE )
40 -ENDIF(CMAKE_COMPILER_IS_GNUCC)
41 +ENDIF(CMAKE_COMPILER_IS_GNUCC)
42
43
44 #Single output directory for building all executables and libraries.
45 @@ -172,7 +172,7 @@
46 "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
47 "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
48 IMMEDIATE @ONLY)
49 -
50 +
51 ADD_CUSTOM_TARGET(uninstall
52 "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
53
54 diff -Naur clucene-core-2.3.3.4-old/src/shared/cmake/MacroEnsureVersion.cmake clucene-core-2.3.3.4/src/shared/cmake/MacroEnsureVersion.cmake
55 --- clucene-core-2.3.3.4-old/src/shared/cmake/MacroEnsureVersion.cmake 2018-12-30 01:11:38.579342982 +0100
56 +++ clucene-core-2.3.3.4/src/shared/cmake/MacroEnsureVersion.cmake 2018-12-30 01:12:53.301528727 +0100
57 @@ -24,7 +24,7 @@
58
59 # compute an overall version number which can be compared at once
60 MATH(EXPR req_vers_num "${req_major_vers}*10000 + ${req_minor_vers}*100 + ${req_patch_vers}")
61 - MATH(EXPR found_vers_num "${found_major_vers}*10000 + ${found_minor_vers}*100 + ${found_patch_vers}")
62 + #MATH(EXPR found_vers_num "${found_major_vers}*10000 + ${found_minor_vers}*100 + ${found_patch_vers}")
63
64 if (found_vers_num LESS req_vers_num)
65 set( ${var_too_old} FALSE )
|
