Changeset d5e4e94 in tol for rtol/source

Timestamp:

Dec 18, 2015, 9:14:37 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b22a1e2

Parents:

024977a

Message:

refs #1904, en linux solo necesitamos requerir TOL, para windows hay que especificar todas las dependencias.

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

File:

• rtol/source/CMakeLists.txt (modified) (1 diff)

rtol/source/CMakeLists.txt

@@ -13 +13 @@
 
 set_target_properties( tolRlink PROPERTIES PREFIX "")
-target_link_libraries( tolRlink ${TOL_LIBRARIES} ${RINSIDE_LIBRARIES} )
+
+target_link_libraries( tolRlink ${TOL_LIBRARIES} )
+if( WIN32 )
+  target_link_libraries( tolRlink ${R_LIBRARY_BASE} )
+endif( WIN32 )
 
 # message( STATUS "RTOL_DEST_DIR = ${RTOL_DEST_DIR}" )