luceneplusplus · jomart1985 · Jul 27, 2011 · Aug 10, 2011 · Aug 21, 2011 · May 5, 2012
diff --git a/.gitignore b/.gitignore
@@ -6,10 +6,10 @@
 *.cmd
 *.suo
 *.ncb
-*.idb 
-*.obj 
-*.opt 
-*.pch 
+*.idb
+*.obj
+*.opt
+*.pch
 *.pyc
 *.log
 *.exe
@@ -21,6 +21,10 @@
 *.manifest
 *.user
 *.bak
+*.orig
+*.lock*
+*.waf*
+.DS_Store
 bin/*
 src/msvc/Debug DLL
 src/msvc/Debug Static
@@ -51,3 +55,31 @@ src/demo/searchfiles/msvc/Release DLL
 src/demo/searchfiles/msvc/Release Static
 src/demo/searchfiles/msvc/Debug DLL
 src/demo/searchfiles/msvc/Debug Static
+CMakeCache.txt
+CMakeFiles/
+build/
+CTestTestfile.cmake
+Makefile
+cmake_install.cmake
+cmake_uninstall.cmake
+include/Config.h
+install_manifest.txt
+liblucene++-contrib.pc
+liblucene++.pc
+src/contrib/CMakeFiles/
+src/contrib/CTestTestfile.cmake
+src/contrib/Makefile
+src/contrib/cmake_install.cmake
+src/core/CMakeFiles/
+src/core/CTestTestfile.cmake
+src/core/Makefile
+src/core/cmake_install.cmake
+src/demo/CMakeFiles/
+src/demo/CTestTestfile.cmake
+src/demo/Makefile
+src/demo/cmake_install.cmake
+src/test/CMakeFiles/
+src/test/CTestTestfile.cmake
+src/test/Makefile
+src/test/cmake_install.cmake
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,191 +1,134 @@
-project(lucene++-base)
-
 ####################################
-# VERSION information
-#These versions match the Lucene version
-SET(LUCENE++_VERSION_MAJOR "3")
-SET(LUCENE++_VERSION_MINOR "0")
-SET(LUCENE++_VERSION_REVISION "3")
-SET(LUCENE++_VERSION_PATCH "4")
-
-# SOVERSION information
-#Must be incremented for releases if the api is not backwards compatible
-SET(LUCENE++_SOVERSION "0")
-
-#derived versions
-MATH(EXPR LUCENE++_INT_VERSION "(${LUCENE++_VERSION_MAJOR} * 1000000) + (${LUCENE++_VERSION_MINOR} * 10000) + (${LUCENE++_VERSION_REVISION} * 100) + (${LUCENE++_VERSION_PATCH} * 1)" )
-SET(LUCENE++_VERSION "${LUCENE++_VERSION_MAJOR}.${LUCENE++_VERSION_MINOR}.${LUCENE++_VERSION_REVISION}.${LUCENE++_VERSION_PATCH}")
-MESSAGE(${LUCENE++_INT_VERSION})
-MESSAGE(${LUCENE++_VERSION})
-
+# init
 ####################################
 
-####################################
-# Build system options and includes
-####################################
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
-#build policies
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
+cmake_minimum_required(VERSION 3.5)
 
-# include specific modules
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
-#if setup using the Toolchain-llvm.cmake file, then use llvm...
-IF ( ENABLE_LLVM )
-  INCLUDE (Toolchain-llvm)
-ENDIF ( ENABLE_LLVM )
-
-#define options...
-INCLUDE (Lucene++Docs)
-INCLUDE (FindThreads)
-INCLUDE (TestCXXAcceptsFlag)
-ENABLE_TESTING()
-
-#Single output directory for building all executables and libraries.
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Executable Output Directory" FORCE)
-SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Library Output Directory" FORCE)
-####################################
+project(lucene++)
 
-####################################
-#user specified build options
-####################################
-IF(NOT CMAKE_BUILD_TYPE)
-    SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
-      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-      FORCE)
-ELSE(NOT CMAKE_BUILD_TYPE)
-    MESSAGE( "Compiling as ${CMAKE_BUILD_TYPE}" )
-ENDIF(NOT CMAKE_BUILD_TYPE)
-
-OPTION(ENABLE_PACKAGING
-  "create build scripts for creating lucene++ packages"
-  OFF)
-OPTION(ENABLE_NEDMALLOC
-  "use nedmalloc for memory allocations"
-  OFF)
-OPTION(LUCENE_USE_STATIC_BOOST_LIBS
-  "use static boost libraries "
-  OFF)
-OPTION(ENABLE_CYCLIC_CHECK
-  "enable cyclic checking "
-  OFF)
-
-#install path options
-SET(LIB_DESTINATION "lib" CACHE STRING "Define lib output directory name")
-
-IF ( ENABLE_NEDMALLOC )
-  ADD_DEFINITIONS(-DLPP_USE_NEDMALLOC)
-ENDIF ( ENABLE_NEDMALLOC )
-IF ( ENABLE_CYCLIC_CHECK )
-  ADD_DEFINITIONS(-DLPP_USE_CYCLIC_CHECK)
-ENDIF ( ENABLE_CYCLIC_CHECK )
-####################################
+set(lucene++_VERSION_MAJOR 3)
+set(lucene++_VERSION_MINOR 0)
+set(lucene++_VERSION_PATCH 9)
+set(lucene++_SOVERSION "0")
+
+set(lucene++_VERSION
+  "${lucene++_VERSION_MAJOR}.${lucene++_VERSION_MINOR}.${lucene++_VERSION_PATCH}")
+
+
+# set default build type as release
+if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+set(LIB_DESTINATION
+  "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Define lib output directory name")
 
 
 ####################################
-# PLATFORM specific options
+# CMake Modules
 ####################################
-#add a debug build postfix
-if(WIN32 OR WIN64)
- set(CMAKE_DEBUG_POSTFIX "d")
-endif(WIN32 OR WIN64)
 
-if(NOT MSVC AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.")
-        add_definitions(-fPIC)
-endif(NOT MSVC AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.")
+# include specific modules
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(options.cmake)
+
+# pre-compiled headers support
+include(cotire)
 
-INCLUDE(MacroCheckGccVisibility)
-MACRO_CHECK_GCC_VISIBILITY(LPP_HAVE_GXXCLASSVISIBILITY)
-if ( LPP_HAVE_GXXCLASSVISIBILITY )
-	ADD_DEFINITIONS(-DLPP_HAVE_GXXCLASSVISIBILITY)
+# if setup using the Toolchain-llvm.cmake file, then use llvm...
+if(ENABLE_LLVM)
+  include(Toolchain-llvm)
 endif()
 
-IF(CYGWIN)
-  ADD_DEFINITIONS(-D__LARGE64_FILES)
-ENDIF(CYGWIN)
-
-#set ansi mode 
-SET(ENABLE_ANSI_MODE OFF)
-IF(CMAKE_COMPILER_IS_GNUCXX)
-  SET(ENABLE_ANSI_MODE ON)
-
-  #exceptions:
-  IF(MINGW OR CYGWIN)
-    SET(ENABLE_ANSI_MODE OFF)
-  ENDIF(MINGW OR CYGWIN)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-IF ( CMAKE_COMPILER_IS_GNUCC )
-   IF( ENABLE_ANSI_MODE )
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
-   ENDIF ( ENABLE_ANSI_MODE )
-ENDIF(CMAKE_COMPILER_IS_GNUCC) 
+# fetch dependencies
+include(dependencies)
 
-####################################
-#find boost
-####################################
-SET(Boost_USE_STATIC_LIBS   ${LUCENE_USE_STATIC_BOOST_LIBS})
-SET(Boost_USE_MULTITHREADED ON)
-#Boost 1.38 required for bug fixes in basic_streambuf. 
-#The following line fails in earlier builds, so if altered, may allow older versions of boost:
-#boost::gregorian::date date = parser.parse_date(paddedDate.c_str(), dateFormat->c_str(), svp);
-find_package( Boost 1.38.0 COMPONENTS date_time filesystem iostreams regex system thread unit_test_framework REQUIRED)
-IF (Boost_FOUND)
-  MESSAGE( STATUS "boost found: includes in ${Boost_INCLUDE_DIRS}, library in ${Boost_LIBRARY_DIRS}")
-  SET(LUCENE_BOOST_LIBS 
-    ${Boost_FILESYSTEM_LIBRARY_RELEASE}
-    ${Boost_IOSTREAMS_LIBRARY_RELEASE}
-    ${Boost_REGEX_LIBRARY_RELEASE}
-    ${Boost_SYSTEM_LIBRARY_RELEASE}
-    ${Boost_THREAD_LIBRARY_RELEASE})
-ENDIF (Boost_FOUND)
+# build docs
+include(Lucene++Docs)
+
+# Enable C++11
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 ####################################
-# Pre-Compiled headers
+# platform specific options
 ####################################
-INCLUDE(PCHSupport)
+if(WIN32 OR WIN64)
+set(CMAKE_DEBUG_POSTFIX "d")
+endif()
 
-#todo: make this optional and make it possible to add more headers - like boost threads
+if(MSVC)
+# Disable automatic boost linking on Windows as libraries are added to the linker explicitly
+add_definitions(-DBOOST_ALL_NO_LIB)
 
+# enable exceptions, see http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
+add_definitions(-EHsc)
 
-####################################
-# The subdirs
-####################################
-#include sub-projects
-ADD_SUBDIRECTORY (src/core)
-ADD_SUBDIRECTORY (src/contrib EXCLUDE_FROM_ALL)
-ADD_SUBDIRECTORY (src/demo EXCLUDE_FROM_ALL)
-ADD_SUBDIRECTORY (src/test)
+# Disable including too many Windows headers
+add_definitions(-DWIN32_LEAN_AND_MEAN)
 
+# Disable the min/max macros that conflict with std::min/std::max
+add_definitions(-DNOMINMAX)
+endif()
 
-#################################
-# install pkg-config file
-#################################
-IF(NOT WIN32)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblucene++.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc @ONLY)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc
-          DESTINATION ${LIB_DESTINATION}/pkgconfig )
-ENDIF(NOT WIN32)
+if(NOT WIN32 AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.")
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
+
+if(CYGWIN)
+  add_definitions(-D__LARGE64_FILES)
+endif()
+
+if(APPLE)
+  set(CMAKE_MACOSX_RPATH ON)
+  set(CMAKE_SKIP_BUILD_RPATH FALSE)
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+  if("${isSystemDir}" STREQUAL "-1")
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  endif()
+endif()
 
 
 ####################################
-# Custom targets
+# custom targets
 ####################################
-#add uninstall command
-CONFIGURE_FILE(
+configure_file(
   "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+  IMMEDIATE @ONLY
+)
+
+add_custom_target(
+  uninstall
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  VERBATIM
+)
+
+if(ENABLE_PACKAGING)
+  include(CreateLucene++Packages)
+endif()
 
 
 ####################################
-# Finalise build script
+# bootstrap
 ####################################
 
-#this must go last...
-IF (ENABLE_PACKAGING)
-  INCLUDE(CreateLucene++Packages)
-ENDIF ( ENABLE_PACKAGING)
+include(TestCXXAcceptsFlag)
+include(GNUInstallDirs)
+
+add_subdirectory(include)
+add_subdirectory(src)
+
+message("\n\n** Build Summary **")
+message("  Version:          ${lucene++_VERSION}")
+message("  Prefix:           ${CMAKE_INSTALL_PREFIX}")
+message("  Build Type:       ${CMAKE_BUILD_TYPE}")
+message("  Architecture:     ${CMAKE_SYSTEM_PROCESSOR}")
+message("  System:           ${CMAKE_SYSTEM_NAME}")
+message("  Boost Include:    ${Boost_INCLUDE_DIRS}")
+message("  Boost Libraries:  ${Boost_LIBRARY_DIRS}")
+message("  Zlib Include:     ${ZLIB_INCLUDE_DIRS}")
+message("  Zlib Library:     ${ZLIB_LIBRARY_RELEASE}")