Context Navigation

← Previous Changeset
Next Changeset →

Changeset 8685395 in tol

Timestamp:

Jan 11, 2016, 8:11:03 PM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

171e6a0

Parents:

9450eca

Message:

Refs #1899
Se incorpora el CMakeLists.txt para el instalador en Windows.
Dispone de la posibilidad de crear el instalador para 32 y para 64 bits.
Dispone de la posibilidad de incluir tolbase o no.
Para que funcione adecuadamente la sentencia include(CPack) ha de moverse de archivo.

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

Location:

installer

Files:

: 1 added
: 3 edited

CMakeLists.txt (modified) (1 diff)
linux/CMakeLists.txt (modified) (1 diff)
windows/CMakeLists.txt (added)
windows/NSIS/NSIS.template.in (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

installer/CMakeLists.txt

r9450eca	r8685395
21	21	add_subdirectory( linux )
22	22	endif( WIN32 )
23
24		~~include( CPack )~~

installer/linux/CMakeLists.txt

r9450eca	r8685395
166	166	#endif( SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR STREQUAL "RPM" )
167	167	# Estudiar como hacer lo mismo con CPACK_DEBIAN_core_PACKAGE_CONTROL_EXTRA
	168
	169	include( CPack )

installer/windows/NSIS/NSIS.template.in

r9450eca	r8685395
22	22	;--------------------------------
23	23	!include "StrFunc.nsh"
24		!addincludedir @CMAKE_SOURCE_DIR@/NSIS
	24	!addincludedir @CMAKE_SOURCE_DIR@/windows/NSIS
25	25	!include EnvVarUpdate.nsh
26	26	;Include Modern UI

Note: See TracChangeset for help on using the changeset viewer.