Changeset 41890bb in tol for toltcl/CMakeLists.txt

Timestamp:

Sep 18, 2015, 11:54:03 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

9e177ec

Parents:

c987a37

Message:

refs #1866, tolsh cortocircuita el procesamiento de argv para evitar que tcl procese e interprete nuestras opciones de linea de comandos, se corrigen algunos aspectos de instalación en Linux

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

File:

• toltcl/CMakeLists.txt (modified) (1 diff)

toltcl/CMakeLists.txt

@@ -55 +55 @@
   message( STATUS ${TCL_INCLUDE_PATH} )
   message( STATUS ${TCL_LIBRARY_PATH} )
-  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  if ( NOT CMAKE_INSTALL_PREFIX )
+    get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  endif( )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )