Changeset 6d12912 in tol

Timestamp:

Nov 24, 2015, 11:26:10 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

8beb569

Parents:

cdd8fca

Message:

Se corrigen las barras de la variable CMAKE_INSTALL_PREFIX pare evitar advertencias de CMake en el install, al intentar interpretarlas como caracteres escapados.

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

Files:

• tolbase/CMakeLists.txt (modified) (2 diffs)
• toltcl/CMakeLists.txt (modified) (2 diffs)

tolbase/CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required( VERSION 2.8 )
-project( TOLTCL )
+project( TOLBASE )
 
 set( CMAKE_MODULE_PATH
@@ -54 +54 @@
   message( STATUS ${TCL_INCLUDE_PATH} )
   get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  if( WIN32 )
+    string( REPLACE "\\" "/" CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) 
+  endif( WIN32 )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )

toltcl/CMakeLists.txt

@@ -62 +62 @@
     get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
   endif( )
+  if( WIN32 )
+    string( REPLACE "\\" "/" CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) 
+  endif( WIN32 )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )
@@ -70 +73 @@
   CACHE INTERNAL "" )
 
-if( UNIX )
-  add_subdirectory( bin )
-endif( UNIX )
-
 add_subdirectory( generic )
 add_subdirectory( library )