Changeset ed3716e in tol for toltcl/cmake

Timestamp:

Oct 11, 2015, 9:56:21 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

db5c687

Parents:

a716459

Message:

refs #1866, TOL_PREFIX_PATH puede ser un path relativo, CMAKE_INSTALL_PREFIX en windows viene con un valor por omisión hay que sobreescribirlo, se corrigen errores de conversión entre int y void*

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

File:

• toltcl/cmake/modules/FindTOL.cmake (modified) (3 diffs)

toltcl/cmake/modules/FindTOL.cmake

@@ -14 +14 @@
 set( TOL_FOUND 0 )
 
-if( EXISTS ${TOL_PREFIX_PATH} )
-
+if( DEFINED TOL_PREFIX_PATH )
+  if( NOT IS_ABSOLUTE ${TOL_PREFIX_PATH} )
+    file( TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${TOL_PREFIX_PATH}" TOL_PREFIX_PATH )
+    get_filename_component( TOL_PREFIX_PATH ${TOL_PREFIX_PATH} ABSOLUTE )
+  endif()
   #find includes
   find_path(
@@ -28 +31 @@
     PATH_SUFFIXES "lib"
     NO_DEFAULT_PATH )
-else(  EXISTS ${TOL_PREFIX_PATH} )
+else( DEFINED TOL_PREFIX_PATH )
 
   #find includes
@@ -36 +39 @@
   find_library( TOL_LIBRARY
     NAMES tol )
-endif( EXISTS ${TOL_PREFIX_PATH} )
+endif( DEFINED TOL_PREFIX_PATH )
 
 set( TOL_PROCESS_INCLUDES TOL_INCLUDE_DIR )