diff --git a/CMakeLists.txt b/CMakeLists.txt index 8412bd230d95fb926ab15688848653bf9b634ecd..8e4d8fa673921d5475131bca2955cc212661a843 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,17 +8,6 @@ endif(COMMAND cmake_policy) # The project name and the type of project PROJECT(iriutils) -SET(CPACK_PACKAGE_VERSION "1.0.0") -SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "0") -SET(CPACK_PACKAGE_VERSION_PATCH "0") -IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") - SET (X86 TRUE) - SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") -ELSE () - SET (X86 FALSE) - SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386") -ENDIF() SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) @@ -43,13 +32,13 @@ SET(CMAKE_LINK_FLAGS_DEBUG "--coverage -fprofile-arcs") # # Add ctest # -INCLUDE(CTest) +# INCLUDE(CTest) ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(test/gtest) +# ADD_SUBDIRECTORY(test/gtest) -ADD_SUBDIRECTORY(test) +# ADD_SUBDIRECTORY(test) FIND_PACKAGE(Doxygen) @@ -93,6 +82,18 @@ ELSE(UNIX) ) ENDIF(UNIX) +SET(CPACK_PACKAGE_VERSION "1.0.0") +SET(CPACK_PACKAGE_VERSION_MAJOR "1") +SET(CPACK_PACKAGE_VERSION_MINOR "0") +SET(CPACK_PACKAGE_VERSION_PATCH "0") +IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") + SET (X86 TRUE) + SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") +ELSE () + SET (X86 FALSE) + SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386") +ENDIF() + IF (UNIX) SET(CPACK_PACKAGE_FILE_NAME "iri-${PROJECT_NAME}-dev-${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") SET(CPACK_PACKAGE_NAME "iri-${PROJECT_NAME}-dev") @@ -101,6 +102,7 @@ IF (UNIX) SET(CPACK_GENERATOR "DEB") SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "galenya - labrobotica@iri.upc.edu") SET(CPACK_SET_DESTDIR "ON") # Necessary because of the absolute install paths + set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/package_scripts/preinst;${CMAKE_SOURCE_DIR}/package_scripts/postinst;${CMAKE_SOURCE_DIR}/package_scripts/prerm;${CMAKE_SOURCE_DIR}/package_scripts/postrm") INCLUDE(CPack) ELSE(UNIX)