Репозитории ALT
S: | 3.27.6-alt1 |
5.1: | 2.6.4-alt2 |
4.1: | 2.6.3-alt1.M41.1 |
3.0: | 2.0.5-alt1 |
Группа :: Development/Tools
Пакет: cmake
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: cmake-2.6.0-alt-dynamic-linking.patch
Скачать
Скачать
--- cmake/CMakeLists.txt.orig 2008-05-06 00:25:53 +0600
+++ cmake/CMakeLists.txt 2008-05-11 13:59:03 +0600
@@ -220,6 +220,9 @@ MACRO (CMAKE_BUILD_UTILITIES)
SET(KWSYS_USE_Process 1)
SET(KWSYS_USE_CommandLineArguments 1)
SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
+ IF(BUILD_SHARED_LIBS)
+ SET(KWSYS_INSTALL_LIB_DIR lib)
+ ENDIF(BUILD_SHARED_LIBS)
SUBDIRS(Source/kwsys)
#---------------------------------------------------------------------
@@ -449,13 +452,17 @@ ENDIF(BUILD_QtDialog)
# The executables are then built with the RPATH for the libraries outside
# the build tree, which is both the build and the install RPATH.
IF (UNIX)
- IF( CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB
+ IF(BUILD_SHARED_LIBS)
+ SET(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.")
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ SET(SKIP_BUILD_RPATH FALSE)
+ ELSEIF(CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB
OR CMAKE_USE_SYSTEM_EXPAT OR CMAKE_USE_SYSTEM_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH)
SET(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
- ENDIF(CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB
- OR CMAKE_USE_SYSTEM_EXPAT OR CMAKE_USE_SYSTEM_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH)
+ ENDIF(BUILD_SHARED_LIBS)
ENDIF (UNIX)
--- cmake/Source/CMakeLists.txt.orig 2008-05-06 00:25:54 +0600
+++ cmake/Source/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -455,5 +455,10 @@ INSTALL_TARGETS(/bin cpack)
IF(APPLE)
INSTALL_TARGETS(/bin cmakexbuild)
ENDIF(APPLE)
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib CMakeLib)
+ INSTALL_TARGETS(/lib CPackLib)
+ INSTALL_TARGETS(/lib CTestLib)
+ENDIF(BUILD_SHARED_LIBS)
INSTALL_FILES(${CMAKE_DATA_DIR}/include cmCPluginAPI.h)
--- cmake/Source/CursesDialog/form/CMakeLists.txt.orig 2008-05-06 00:25:56 +0600
+++ cmake/Source/CursesDialog/form/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -53,3 +53,6 @@ TARGET_LINK_LIBRARIES(cmForm ${CURSES_LI
IF(CURSES_EXTRA_LIBRARY)
TARGET_LINK_LIBRARIES(cmForm ${CURSES_EXTRA_LIBRARY})
ENDIF(CURSES_EXTRA_LIBRARY)
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib cmForm)
+ENDIF(BUILD_SHARED_LIBS)
--- cmake/Utilities/cmcompress/CMakeLists.txt.orig 2008-05-06 00:25:59 +0600
+++ cmake/Utilities/cmcompress/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -1,3 +1,7 @@
PROJECT(CMCompress)
ADD_LIBRARY(cmcompress cmcompress.c)
+
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib cmcompress)
+ENDIF(BUILD_SHARED_LIBS)
--- cmake/Utilities/cmcurl/CMakeLists.txt.orig 2008-05-06 00:25:59 +0600
+++ cmake/Utilities/cmcurl/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -708,3 +708,6 @@ ENDIF(CURL_TESTING)
ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
ADD_TEST(curl "${EXECUTABLE_OUTPUT_PATH}/LIBCURL")
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib cmcurl)
+ENDIF(BUILD_SHARED_LIBS)
--- cmake/Utilities/cmexpat/CMakeLists.txt.orig 2008-05-06 00:25:59 +0600
+++ cmake/Utilities/cmexpat/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -32,3 +32,6 @@ CONFIGURE_FILE(${CMEXPAT_SOURCE_DIR}/exp
${CMEXPAT_BINARY_DIR}/expat.h)
ADD_LIBRARY(cmexpat ${expat_SRCS})
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib cmexpat)
+ENDIF(BUILD_SHARED_LIBS)
--- cmake/Utilities/cmtar/CMakeLists.txt.orig 2008-05-06 00:26:00 +0600
+++ cmake/Utilities/cmtar/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -384,6 +384,10 @@ INCLUDE_DIRECTORIES(${CMTAR_ZLIB_INCLUDE
CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/config.h.in
${LIBTAR_BINARY_DIR}/libtar/config.h)
-ADD_LIBRARY(cmtar STATIC ${libtar_SRC})
+ADD_LIBRARY(cmtar ${libtar_SRC})
ADD_EXECUTABLE(tartest libtar.c)
TARGET_LINK_LIBRARIES(tartest cmtar ${CMTAR_ZLIB_LIBRARIES})
+
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib cmtar)
+ENDIF(BUILD_SHARED_LIBS)
--- cmake/Utilities/cmxmlrpc/CMakeLists.txt.orig 2008-05-06 00:26:01 +0600
+++ cmake/Utilities/cmxmlrpc/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -126,3 +126,6 @@ TARGET_LINK_LIBRARIES(xrtest cmXMLRPC ${
# comment out test since it doesn pass and Andy doesn;t seem to be fixing it,
# for now assume that XMLRPC is not production quality code - Ken
# ADD_TEST(Test-XMLRPC ${EXECUTABLE_OUTPUT_PATH}/xrtest)
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib cmXMLRPC)
+ENDIF(BUILD_SHARED_LIBS)
--- cmake/Utilities/cmzlib/CMakeLists.txt.orig 2008-05-06 00:26:01 +0600
+++ cmake/Utilities/cmzlib/CMakeLists.txt 2008-05-11 01:21:56 +0600
@@ -42,3 +42,6 @@ ENDFOREACH(name)
ADD_LIBRARY(cmzlib ${ZLIB_SRCS})
+IF(BUILD_SHARED_LIBS)
+ INSTALL_TARGETS(/lib cmzlib)
+ENDIF(BUILD_SHARED_LIBS)