Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 644926
Collapse All | Expand All

(-)a/usr/portage/eclass/cmake-utils.eclass (-8 / +14 lines)
Lines 576-589 Link Here
576
576
577
	if [[ ${EPREFIX} ]]; then
577
	if [[ ${EPREFIX} ]]; then
578
		cat >> "${build_rules}" <<- _EOF_ || die
578
		cat >> "${build_rules}" <<- _EOF_ || die
579
			# in Prefix we need rpath and must ensure cmake gets our default linker path
579
			# Be sure *not* to have WIN32 set on cygwin hosts
580
			# right ... except for Darwin hosts
580
			IF (CYGWIN)
581
			IF (NOT APPLE)
581
			SET (WIN32 OFF CACHE BOOL "" FORCE)
582
			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
582
			ENDIF (CYGWIN)
583
			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
584
			CACHE STRING "" FORCE)
585
583
586
			ELSE ()
584
			# in Prefix we need rpath and must ensure cmake gets our default linker path
585
			# right ... except for Darwin and Cygwin hosts
586
			IF (APPLE OR CYGWIN)
587
587
588
			SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
588
			SET(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
589
			SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
589
			SET(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
Lines 591-597 Link Here
591
			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
591
			SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
592
			SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
592
			SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
593
593
594
			ENDIF (NOT APPLE)
594
			ELSE ()
595
596
			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
597
			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
598
			CACHE STRING "" FORCE)
599
600
			ENDIF (APPLE OR CYGWIN)
595
		_EOF_
601
		_EOF_
596
	fi
602
	fi
597
603

Return to bug 644926