bf9bfb904f
* Built-in Control Points Generator * Improved Unattended Operation * Improved Interaction and Functionality * Improved Reporting of Stitching and System Information * New Command-Line Tools * Refactored Makefile Library * Libraries and Build Improvements * Migration to Launchpad * New Visuals
30 lines
1.1 KiB
Text
30 lines
1.1 KiB
Text
$NetBSD: patch-ac,v 1.4 2011/01/12 11:46:28 adam Exp $
|
|
|
|
--- CMakeLists.txt.orig 2010-09-28 22:06:42.000000000 +0000
|
|
+++ CMakeLists.txt
|
|
@@ -319,7 +319,7 @@ IF (NOT MANDIR AND NOT $ENV{MANDIR} STRE
|
|
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
|
|
SET (MANDIR "man")
|
|
ELSE(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "")
|
|
- SET (MANDIR "share/man")
|
|
+ SET (MANDIR "man")
|
|
ENDIF(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "")
|
|
|
|
SET(LOCALEDIR share/locale)
|
|
@@ -355,16 +355,6 @@ IF (APPLE)
|
|
ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
|
|
ENDIF (APPLE)
|
|
|
|
-IF (${HUGIN_SHARED} AND UNIX AND NOT APPLE)
|
|
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/hugin")
|
|
- SET(HUGIN_LIBS_PRIVATE_DIR "1" CACHE INTERNAL "Store internal
|
|
- libraries in private subdirectory" )
|
|
-ELSE (${HUGIN_SHARED} AND UNIX AND NOT APPLE)
|
|
- # On OS X files are moved around after make install, do not try to use
|
|
- # rpath or CMAKE_INSTALL_NAME_DIR
|
|
- SET(HUGIN_LIBS_PRIVATE_DIR "0" CACHE INTERNAL "Store internal
|
|
- libraries in private subdirectory" )
|
|
-ENDIF (${HUGIN_SHARED} AND UNIX AND NOT APPLE)
|
|
|
|
IF (UNIX)
|
|
IF (${HUGIN_SHARED})
|