Changeset 30f6735 in tol for CMakeLists.txt

Timestamp:

Nov 16, 2015, 9:45:57 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

cab5723

Parents:

4669581

Message:

Refs #1860
Se modifican las dependencias para DEB.
Se incorporan algunas líneas (comentadas) sobre la creación de scripts para el lanzamiento de tolcon y tolsh, para revisar.
Se incorporan líneas para la instalación/desinstalación de dependencias en install-deb.sh

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7038 be4846ae-f051-483a-831f-b64e7d08527f

File:

• CMakeLists.txt (modified) (3 diffs)

CMakeLists.txt

@@ -51 +51 @@
   EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
   message( STATUS "Architecture: ${ARCHITECTURE}" )
+
+  # RPM
   set( CPACK_RPM_PACKAGE_AUTOREQ " no" )
   #set( CPACK_RPM_PACKAGE_REQUIRES "suitesparse >= 3, boost-filesystem >= 1.41, boost-thread >= 1.41, fftw-devel >= 3")
@@ -57 +59 @@
   # postgresql-libs >= 8.4, mysql-libs, unixODBC
   set( CPACK_RPM_PACKAGE_ARCHITECTURE ${ARCHITECTURE} )
+
+  # DEB
+  #set(CPACK_DEBIAN_PACKAGE_DEPENDS "liblapacke (>= 3.5.0-2), libblas3 (>= 1.2)")
+  set( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-filesystem-dev (>= 1.41), libboost-thread-dev (>= 1.41), libsuitesparse-dev, libfftw3-dev, libgsl0-dev (>= 1.13), bzip2, zlib1g-dev, libltdl-dev, libcurl3 (>=7.19)" )
+# ya estaban libcurl3 y bzip2
 endif( UNIX )
-
-#set( CPACK_RPM_PACKAGE_ARCHITECTURE 
 
 if(WIN32)
@@ -116 +121 @@
   file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/include" include_dir)
   install(DIRECTORY ${include_dir} DESTINATION "lib/tol${CPACK_PACKAGE_VERSION}")
+  # SCRIPTS (/usr/bin)
+  ## !!
+  ## file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/building/Linux_32/scripts/tol*" sh_pattern)
+  ## file(GLOB RT_SH  ${sh_pattern})
+  ## install(FILES ${RT_SH} DESTINATION "bin" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 endif(UNIX)