Changeset 565b311 in tol for toltcl

Timestamp:

Mar 16, 2015, 10:24:00 AM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

5e88b2f

Parents:

c7329f6

Message:

#refrefs #1812, refs #1818, toltcl con mingw32

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

File:

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

toltcl/generic/CMakeLists.txt

@@ -6 +6 @@
 message( STATUS "Using TCL_LIBRARY = ${TCL_LIBRARY}" )
 
-# use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+if ( NOT WIN32 )
+        # use, i.e. don't skip the full RPATH for the build tree
+  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
 
-# when building, don't use the install RPATH already
-# (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+  # when building, don't use the install RPATH already
+  # (but later on when installing)
+  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  # add the automatically determined parts of the RPATH
+  # which point to directories outside the build tree to the install RPATH
+  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 
-# the RPATH to be used when installing, but only if it's not a system directory
-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-IF("${isSystemDir}" STREQUAL "-1")
-   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-ENDIF("${isSystemDir}" STREQUAL "-1")
+  # the RPATH to be used when installing, but only if it's not a system directory
+  LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+  IF("${isSystemDir}" STREQUAL "-1")
+     SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  ENDIF("${isSystemDir}" STREQUAL "-1")
+endif( NOT WIN32 )
 
 add_library( toltcl SHARED
@@ -38 +40 @@
 target_link_libraries( tolsh ${TCL_LIBRARY} )
 
+message( STATUS "TOLTCL_DEST_DIR = ${TOLTCL_DEST_DIR}" )
 install( TARGETS tolsh RUNTIME DESTINATION "bin" )
 if( WIN32 )