From 7ad3dedea2f123e120fb60f0880e7ee906c20860 Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 17:01:51 +0100 Subject: [PATCH 1/9] Add SKIP_DAEMON option. Change hardcoded paths to use CMAKE_INSTALL_PREFIX and CMAKE_INSTALL_SYSCONFDIR. --- src/CMakeLists.txt | 38 ++++++++++++++++++++++++++++++------- src/openalpr/CMakeLists.txt | 18 +++++++++--------- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ac8f82..d6a2b4a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,8 +13,19 @@ add_definitions( -DOPENALPR_MAJOR_VERSION=${OPENALPR_MAJOR_VERSION}) add_definitions( -DOPENALPR_MINOR_VERSION=${OPENALPR_MINOR_VERSION}) add_definitions( -DOPENALPR_PATCH_VERSION=${OPENALPR_PATCH_VERSION}) + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") +# TODO: switch to http://www.cmake.org/cmake/help/v2.8.5/cmake.html#module:GNUInstallDirs ? +IF (NOT CMAKE_INSTALL_SYSCONFDIR) + SET(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc") +ENDIF() + +#MESSAGE( STATUS " kkjjkj + +IF (NOT WIN32 AND NOT SKIP_DAEMON) + SET(INSTALL_DAEMON ON) +ENDIF() FIND_PACKAGE( Tesseract REQUIRED ) @@ -64,7 +75,7 @@ TARGET_LINK_LIBRARIES(alpr ) # Compile the alprd library on Unix-based OS -IF (NOT WIN32) +IF (INSTALL_DAEMON) ADD_EXECUTABLE( alprd daemon.cpp daemon/beanstalk.c daemon/beanstalk.cc ) TARGET_LINK_LIBRARIES(alprd @@ -89,12 +100,14 @@ add_subdirectory(openalpr) add_subdirectory(video) -install (TARGETS alpr DESTINATION /usr/bin) -install (TARGETS alprd DESTINATION /usr/bin) -install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION /usr/share/man/man1 COMPONENT doc) -install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION /usr/share/openalpr/) -install (FILES ${CMAKE_SOURCE_DIR}/../config/openalpr.conf DESTINATION /etc/openalpr/ COMPONENT config) -install (FILES ${CMAKE_SOURCE_DIR}/../config/alprd.conf DESTINATION /etc/openalpr/ COMPONENT config) +install (TARGETS alpr DESTINATION ${CMAKE_INSTALL_PREFIX}/${BINDIR}) +IF (INSTALL_DAEMON) + install (TARGETS alprd DESTINATION ${CMAKE_INSTALL_PREFIX}/${BINDIR}) +ENDIF() +install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 COMPONENT doc) +install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openalpr) +install (FILES ${CMAKE_SOURCE_DIR}/../config/openalpr.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/openalpr COMPONENT config) +install (FILES ${CMAKE_SOURCE_DIR}/../config/alprd.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/openalpr COMPONENT config) SET(CPACK_PACKAGE_VERSION ${OPENALPR_VERSION}) @@ -119,3 +132,14 @@ SET (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${C SET (CPACK_COMPONENTS_ALL Libraries ApplicationData) INCLUDE(CPack) + +# ---------------------------------------------------------------------------- +# Uninstall target, for "make uninstall" +# http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F +# ---------------------------------------------------------------------------- +CONFIGURE_FILE( + "${CMAKE_MODULE_PATH}/templates/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + @ONLY) + +ADD_CUSTOM_TARGET(uninstall COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") diff --git a/src/openalpr/CMakeLists.txt b/src/openalpr/CMakeLists.txt index d979f90..9b055aa 100644 --- a/src/openalpr/CMakeLists.txt +++ b/src/openalpr/CMakeLists.txt @@ -1,5 +1,5 @@ - +SET(Tesseract_DIR "/Users/alex/work/lp/tesseract-ocr") set(lpr_source_files @@ -39,15 +39,15 @@ add_library(openalpr SHARED ${lpr_source_files} ) set_target_properties(openalpr PROPERTIES SOVERSION ${OPENALPR_MAJOR_VERSION}) - TARGET_LINK_LIBRARIES(openalpr - support - ${OpenCV_LIBS} - ${Tesseract_LIBRARIES} - ) +TARGET_LINK_LIBRARIES(openalpr + support + ${OpenCV_LIBS} + ${Tesseract_LIBRARIES} +) -install (FILES alpr.h DESTINATION /usr/include) -install (TARGETS openalpr DESTINATION /usr/lib) +install (FILES alpr.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include) +install (TARGETS openalpr DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) # Add definition for default config file -add_definitions(-DDEFAULT_CONFIG_FILE="/etc/openalpr/openalpr.conf") +add_definitions(-DDEFAULT_CONFIG_FILE="${CMAKE_INSTALL_SYSCONFDIR}/openalpr/openalpr.conf") From 12832b0070a0fc16314ce174664c1f2be30ea90e Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 17:04:12 +0100 Subject: [PATCH 2/9] Remove unwanted Tesseract_DIR definition. --- src/openalpr/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/openalpr/CMakeLists.txt b/src/openalpr/CMakeLists.txt index 9b055aa..db7b88f 100644 --- a/src/openalpr/CMakeLists.txt +++ b/src/openalpr/CMakeLists.txt @@ -1,5 +1,4 @@ -SET(Tesseract_DIR "/Users/alex/work/lp/tesseract-ocr") set(lpr_source_files From 9f213e25f17c225440c5f734b0413a0a69628757 Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 17:05:51 +0100 Subject: [PATCH 3/9] Remove usage of BINDIR. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6a2b4a..a899a5b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,9 +100,9 @@ add_subdirectory(openalpr) add_subdirectory(video) -install (TARGETS alpr DESTINATION ${CMAKE_INSTALL_PREFIX}/${BINDIR}) +install (TARGETS alpr DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) IF (INSTALL_DAEMON) - install (TARGETS alprd DESTINATION ${CMAKE_INSTALL_PREFIX}/${BINDIR}) + install (TARGETS alprd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF() install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 COMPONENT doc) install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openalpr) From 70797bee6ada29c0f3f9570a9aa3dde1346e3baa Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 17:06:47 +0100 Subject: [PATCH 4/9] Remove unused MESSAGE command --- src/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a899a5b..8f7b215 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,7 +13,6 @@ add_definitions( -DOPENALPR_MAJOR_VERSION=${OPENALPR_MAJOR_VERSION}) add_definitions( -DOPENALPR_MINOR_VERSION=${OPENALPR_MINOR_VERSION}) add_definitions( -DOPENALPR_PATCH_VERSION=${OPENALPR_PATCH_VERSION}) - SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") # TODO: switch to http://www.cmake.org/cmake/help/v2.8.5/cmake.html#module:GNUInstallDirs ? @@ -21,8 +20,6 @@ IF (NOT CMAKE_INSTALL_SYSCONFDIR) SET(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc") ENDIF() -#MESSAGE( STATUS " kkjjkj - IF (NOT WIN32 AND NOT SKIP_DAEMON) SET(INSTALL_DAEMON ON) ENDIF() From 57f1afa36b6dab2db28359ed229a5c357344f2b7 Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 17:11:12 +0100 Subject: [PATCH 5/9] Add uninstall target template. --- .../templates/cmake_uninstall.cmake.in | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/cmake_modules/templates/cmake_uninstall.cmake.in diff --git a/src/cmake_modules/templates/cmake_uninstall.cmake.in b/src/cmake_modules/templates/cmake_uninstall.cmake.in new file mode 100644 index 0000000..2037e36 --- /dev/null +++ b/src/cmake_modules/templates/cmake_uninstall.cmake.in @@ -0,0 +1,21 @@ +if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") +endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + +file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +string(REGEX REPLACE "\n" ";" files "${files}") +foreach(file ${files}) + message(STATUS "Uninstalling $ENV{DESTDIR}${file}") + if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") + exec_program( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + if(NOT "${rm_retval}" STREQUAL 0) + message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") + endif(NOT "${rm_retval}" STREQUAL 0) + else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") + message(STATUS "File $ENV{DESTDIR}${file} does not exist.") + endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") +endforeach(file) From 211bb3f514d5e7f4ea85d7de6a846a96f331df8d Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 18:00:03 +0100 Subject: [PATCH 6/9] Change daemon option to WITH_DAEMON, and some logic. --- src/CMakeLists.txt | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8f7b215..34164fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,10 +20,16 @@ IF (NOT CMAKE_INSTALL_SYSCONFDIR) SET(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc") ENDIF() -IF (NOT WIN32 AND NOT SKIP_DAEMON) - SET(INSTALL_DAEMON ON) +IF ( NOT DEFINED WITH_DAEMON ) + SET(WITH_DAEMON ON) ENDIF() +IF (WIN32 AND WITH_DAEMON) + MESSAGE(WARNING "Skipping alprd daemon installation, as it is not supported in Windows.") + SET(WITH_DAEMON OFF) +ENDIF() + +MESSAGE(STATUS "WITH_DAEMON: ${WITH_DAEMON}") FIND_PACKAGE( Tesseract REQUIRED ) include_directories(${Tesseract_INCLUDE_DIRS}) @@ -72,7 +78,7 @@ TARGET_LINK_LIBRARIES(alpr ) # Compile the alprd library on Unix-based OS -IF (INSTALL_DAEMON) +IF (WITH_DAEMON) ADD_EXECUTABLE( alprd daemon.cpp daemon/beanstalk.c daemon/beanstalk.cc ) TARGET_LINK_LIBRARIES(alprd @@ -98,13 +104,14 @@ add_subdirectory(video) install (TARGETS alpr DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -IF (INSTALL_DAEMON) - install (TARGETS alprd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -ENDIF() install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 COMPONENT doc) install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openalpr) install (FILES ${CMAKE_SOURCE_DIR}/../config/openalpr.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/openalpr COMPONENT config) -install (FILES ${CMAKE_SOURCE_DIR}/../config/alprd.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/openalpr COMPONENT config) + +IF (WITH_DAEMON) + install (TARGETS alprd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install (FILES ${CMAKE_SOURCE_DIR}/../config/alprd.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/openalpr COMPONENT config) +ENDIF() SET(CPACK_PACKAGE_VERSION ${OPENALPR_VERSION}) From f7074ec7e6e985859c609a57ebf9f441972ac32d Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 18:01:36 +0100 Subject: [PATCH 7/9] Remove unwated message. --- src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 34164fe..9d281b6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,6 @@ IF (WIN32 AND WITH_DAEMON) SET(WITH_DAEMON OFF) ENDIF() -MESSAGE(STATUS "WITH_DAEMON: ${WITH_DAEMON}") FIND_PACKAGE( Tesseract REQUIRED ) include_directories(${Tesseract_INCLUDE_DIRS}) From bd512a801464d5dc858afc55fcc06c6d4da71eb5 Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 18:14:42 +0100 Subject: [PATCH 8/9] Set the proper value for runtime_dir in openalpr.conf, based on install prefix. --- config/openalpr.conf | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/openalpr.conf b/config/openalpr.conf index bc374b7..51b0016 100644 --- a/config/openalpr.conf +++ b/config/openalpr.conf @@ -1,7 +1,7 @@ [common] ; Specify the path to the runtime data directory -runtime_dir = /usr/share/openalpr/runtime_data +runtime_dir = ${CMAKE_INSTALL_PREFIX}/share/openalpr/runtime_data ocr_img_size_percent = 1.33333333 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9d281b6..032bc23 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -105,7 +105,7 @@ add_subdirectory(video) install (TARGETS alpr DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 COMPONENT doc) install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openalpr) -install (FILES ${CMAKE_SOURCE_DIR}/../config/openalpr.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/openalpr COMPONENT config) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/../config/openalpr.conf ${CMAKE_INSTALL_SYSCONFDIR}/openalpr/openalpr.conf) IF (WITH_DAEMON) install (TARGETS alprd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) From eac02fcfaaa2c46c3f93c7afd0d4ae99df14296a Mon Sep 17 00:00:00 2001 From: twelve17 Date: Sat, 18 Oct 2014 18:31:46 +0100 Subject: [PATCH 9/9] Update how openalpr.conf is generated and ultimately installed. --- config/{openalpr.conf => openalpr.conf.in} | 0 src/CMakeLists.txt | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) rename config/{openalpr.conf => openalpr.conf.in} (100%) diff --git a/config/openalpr.conf b/config/openalpr.conf.in similarity index 100% rename from config/openalpr.conf rename to config/openalpr.conf.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 032bc23..205dd62 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -105,7 +105,10 @@ add_subdirectory(video) install (TARGETS alpr DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 COMPONENT doc) install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openalpr) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/../config/openalpr.conf ${CMAKE_INSTALL_SYSCONFDIR}/openalpr/openalpr.conf) + +# set runtime_data to reflect the current CMAKE_INSTALL_PREFIX +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/../config/openalpr.conf.in ${CMAKE_CURRENT_BINARY_DIR}/config/openalpr.conf) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/config/openalpr.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/openalpr/ COMPONENT config) IF (WITH_DAEMON) install (TARGETS alprd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)