Improvements to the build system

CMakeLists.txt

@@ -0,0 +1,65 @@
+cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0048 NEW)
+
+set(CRFSUITE_MAJOR_VERSION 1)
+set(CRFSUITE_MINOR_VERSION 0)
+set(CRFSUITE_PATCH_VERSION 0)
+set(CRFSUITE_VERSION ${CRFSUITE_MAJOR_VERSION}.${CRFSUITE_MINOR_VERSION}.${CRFSUITE_PATCH_VERSION})
+
+project(crfsuite VERSION ${CRFSUITE_VERSION} LANGUAGES C)
+
+find_package(lbfgs REQUIRED)
+
+add_library(cqdb STATIC lib/cqdb/src/lookup3.c lib/cqdb/src/cqdb.c)
+set(HEADER_FILES
+  lib/cqdb/include/cqdb.h
+)
+target_include_directories(cqdb PRIVATE lib/cqdb/include)
+set_target_properties(cqdb
+  PROPERTIES
+  POSITION_INDEPENDENT_CODE ON
+  PUBLIC_HEADER "${HEADER_FILES}"
+  )
+
+add_library(crf STATIC lib/crf/src/dictionary.c lib/crf/src/logging.c lib/crf/src/params.c lib/crf/src/quark.c lib/crf/src/rumavl.c lib/crf/src/dataset.c lib/crf/src/holdout.c lib/crf/src/train_arow.c lib/crf/src/train_averaged_perceptron.c lib/crf/src/train_l2sgd.c lib/crf/src/train_lbfgs.c lib/crf/src/train_passive_aggressive.c lib/crf/src/crf1d_context.c lib/crf/src/crf1d_model.c lib/crf/src/crf1d_feature.c lib/crf/src/crf1d_encode.c lib/crf/src/crf1d_tag.c lib/crf/src/crfsuite_train.c lib/crf/src/crfsuite.c)
+set(HEADER_FILES
+  lib/crf/src/logging.h lib/crf/src/params.h lib/crf/src/quark.h lib/crf/src/rumavl.h lib/crf/src/vecmath.h lib/crf/src/crfsuite_internal.h lib/crf/src/crf1d.h
+)
+target_include_directories(crf PRIVATE lib/crf/src include lib/cqdb/include ${LBFGS_INCLUDE_DIRS})
+set_target_properties(crf
+  PROPERTIES
+  OUTPUT_NAME crfsuite
+  POSITION_INDEPENDENT_CODE ON
+  PUBLIC_HEADER "${HEADER_FILES}"
+  )
+
+
+add_executable(crfsuite
+  frontend/dump.c frontend/iwa.c frontend/learn.c frontend/main.c frontend/option.c frontend/reader.c frontend/tag.c
+  frontend/iwa.h frontend/option.h frontend/readdata.h
+  )
+target_include_directories(crfsuite PRIVATE lib/crf/src include lib/cqdb/include)
+target_link_libraries(crfsuite crf cqdb m ${LBFGS_LIBRARIES})
+
+install(TARGETS cqdb crf crfsuite EXPORT crfsuite-targets
+  RUNTIME DESTINATION bin COMPONENT bin
+  ARCHIVE DESTINATION lib COMPONENT dev
+  LIBRARY DESTINATION lib COMPONENT shlib
+  PUBLIC_HEADER DESTINATION include COMPONENT dev)
+export(TARGETS cqdb crf FILE "${PROJECT_BINARY_DIR}/crfsuite-targets.cmake")
+export(PACKAGE crfsuite)
+
+
+# Create the Config.cmake and ConfigVersion.cmake files
+get_filename_component(CMAKE_INSTALL_INCLUDEDIR_ABS include REALPATH BASE_DIR "${CMAKE_INSTALL_PREFIX}")
+set(CONF_INCLUDE_DIRS ${CMAKE_INSTALL_INCLUDEDIR_ABS})
+configure_file(crfsuiteConfig.cmake.in "cmake/crfsuiteConfig.cmake" @ONLY)
+configure_file(crfsuiteConfigVersion.cmake.in "cmake/crfsuiteConfigVersion.cmake" @ONLY)
+install(FILES "${PROJECT_BINARY_DIR}/cmake/crfsuiteConfig.cmake" "${PROJECT_BINARY_DIR}/cmake/crfsuiteConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/crfsuite" COMPONENT dev)
+set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}")
+configure_file(crfsuiteConfig.cmake.in "crfsuiteConfig.cmake" @ONLY)
+configure_file(crfsuiteConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/crfsuiteConfigVersion.cmake" @ONLY)
+
+# add_executable(sample sample/sample.c)
+# target_link_libraries(sample PRIVATE crfsuite m)
+# target_include_directories(sample PRIVATE ${CONF_INCLUDE_DIRS})

Makefile.am

@@ -9,11 +9,15 @@ EXTRA_DIST = \
 	crfsuite.sln \
 	autogen.sh \
 	win32/stdint.h \
+	win32/inttypes.h \
 	example/crfutils.py \
 	example/template.py \
 	example/pos.py \
 	example/ner.py \
-	example/chunking.py
+	example/chunking.py \
+	CMakeLists.txt \
+	crfsuiteConfig.cmake.in \
+	crfsuiteConfigVersion.cmake.in
 
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4

configure.in → configure.ac

@@ -44,9 +44,9 @@ AC_PROG_LN_S
 dnl ------------------------------------------------------------------
 dnl Initialization for variables
 dnl ------------------------------------------------------------------
-CFLAGS="-std=c99 ${ac_save_CFLAGS}"
-LDFLAGS="${ac_save_LDFLAGS}"
-INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)"
+CFLAGS="-std=c99 ${CFLAGS}"
+LDFLAGS="${LDFLAGS}"
+INCLUDES="${INCLUDES} -I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)"
 
 
 dnl ------------------------------------------------------------------

crfsuiteConfig.cmake.in

@@ -0,0 +1,16 @@
+# - Config file for the crfsuite package
+# It defines the following variables
+#  CRFSUITE_INCLUDE_DIRS - include directories for crfsuite
+#  CRFSUITE_LIBRARIES    - libraries to link against
+
+# Compute paths
+get_filename_component(CRFSUITE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(CRFSUITE_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
+
+# Our library dependencies (contains definitions for IMPORTED targets)
+if(NOT TARGET crfsuite AND NOT crfsuite_BINARY_DIR)
+  include("${CRFSUITE_CMAKE_DIR}/crfsuite-targets.cmake")
+endif()
+
+# These are IMPORTED targets created by crfsuiteTargets.cmake
+set(CRFSUITE_LIBRARIES crf)

crfsuiteConfigVersion.cmake.in

@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@CRFSUITE_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()

lib/cqdb/Makefile.am

@@ -1,5 +1,7 @@
 # $Id:$
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 lib_LTLIBRARIES = libcqdb.la
 
 EXTRA_DIST = \
@@ -15,7 +17,7 @@ libcqdb_la_LDFLAGS = \
 	-no-undefined \
 	-release @VERSION@
 
-libcqdb_la_CFLAGS = -I./include
+libcqdb_la_CFLAGS = -I$(abs_srcdir)/include
 
 AM_CFLAGS = @CFLAGS@
 AM_CPPFLAGS = @INCLUDES@

lib/crf/Makefile.am

@@ -1,5 +1,7 @@
 # $Id:$
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 lib_LTLIBRARIES = libcrfsuite.la
 
 EXTRA_DIST = \
@@ -33,7 +35,7 @@ libcrfsuite_la_SOURCES = \
 	src/crfsuite_train.c \
 	src/crfsuite.c
 
-libcrfsuite_la_CFLAGS = -I$(top_builddir)/lib/cqdb/include
+libcrfsuite_la_CFLAGS = -I$(abs_top_srcdir)/lib/cqdb/include
 
 libcrfsuite_la_LDFLAGS = \
 	-no-undefined \