Changeset ad6b4a5 in tol for tolbase

Timestamp:

Dec 9, 2015, 10:44:38 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

3974272

Parents:

42be8b0

Message:

refs #1901, hay que forzar el cambio de CMAKE_INSTALL_PREFIX en el cache

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

Location:

tolbase

Files:

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

tolbase/CMakeLists.txt

@@ -59 +59 @@
   message( STATUS ${TCL_LIBRARY_PATH} )
   if( INSTALL_WITH_TOL )
-    set( CMAKE_INSTALL_PREFIX ${TOL_PREFIX_PATH} )
+    set( CMAKE_INSTALL_PREFIX ${TOL_PREFIX_PATH} CACHE PATH "" FORCE )
   else( INSTALL_WITH_TOL )
     get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )

tolbase/ThirdParty/CMakeLists.txt

@@ -39 +39 @@
   ${CMAKE_CURRENT_BINARY_DIR}/lib/* )
 
-#message( STATUS "children = ${children}" )
+#message( STATUS "lib_children = ${lib_children}" )
 
 install( DIRECTORY ${lib_children} COMPONENT RUNTIME DESTINATION lib )