[cmake-commits] hoffman committed CPack.STGZ_Header.sh.in 1.1.2.2
1.1.2.3 FindKDE3.cmake 1.3.2.2 1.3.2.3 FindKDE4.cmake 1.3.2.4
1.3.2.5 FindPythonInterp.cmake 1.5.2.1 1.5.2.2 KDE3Macros.cmake
1.2.2.2 1.2.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 25 14:03:51 EDT 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv31217/Modules
Modified Files:
Tag: CMake-2-4
CPack.STGZ_Header.sh.in FindKDE3.cmake FindKDE4.cmake
FindPythonInterp.cmake KDE3Macros.cmake
Log Message:
ENH: merge in stuff from head
Index: CPack.STGZ_Header.sh.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.STGZ_Header.sh.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- CPack.STGZ_Header.sh.in 3 Jan 2007 21:09:14 -0000 1.1.2.2
+++ CPack.STGZ_Header.sh.in 25 Oct 2007 18:03:48 -0000 1.1.2.3
@@ -84,7 +84,7 @@
@CPACK_RESOURCE_FILE_LICENSE_CONTENT@
____cpack__here_doc____
echo
- echo "Do you accept the license? [Yn]: "
+ echo "Do you accept the license? [yN]: "
read line leftover
case ${line} in
y* | Y*)
@@ -123,7 +123,14 @@
# take the archive portion of this file and pipe it to tar
# the NUMERIC parameter in this command should be one more
# than the number of lines in this header file
-tail -n +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
+# there are tails which don't understand the "-n" argument, e.g. on SunOS
+# OTOH there are tails which complain when not using the "-n" argument (e.g. GNU)
+# so at first try to tail some file to see if tail fails if used with "-n"
+# if so, don't use "-n"
+use_new_tail_syntax="-n"
+tail $use_new_tail_syntax +1 "$0" > /dev/null 2> /dev/null || use_new_tail_syntax=""
+
+tail $use_new_tail_syntax +###CPACK_HEADER_LENGTH### "$0" | gunzip | (cd "${toplevel}" && tar xf -) || cpack_echo_exit "Problem unpacking the @CPACK_PACKAGE_FILE_NAME@"
echo "Unpacking finished successfully"
Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- FindKDE4.cmake 5 Feb 2007 18:21:32 -0000 1.3.2.4
+++ FindKDE4.cmake 25 Oct 2007 18:03:48 -0000 1.3.2.5
@@ -13,7 +13,8 @@
FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
# For KDE4 kde-config has been renamed to kde4-config
-FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
+ PATH_SUFFIXES bin # the suffix is for the paths coming from KDEDIRS
PATHS
${CMAKE_INSTALL_PREFIX}/bin
${_KDEDIRS}
@@ -22,9 +23,7 @@
)
-IF (NOT KDE4_KDECONFIG_EXECUTABLE)
- FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
-ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
IF (KDE4_KDECONFIG_EXECUTABLE)
# then ask kde4-config for the kde data dirs
Index: FindPythonInterp.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonInterp.cmake,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- FindPythonInterp.cmake 13 Oct 2006 14:52:01 -0000 1.5.2.1
+++ FindPythonInterp.cmake 25 Oct 2007 18:03:48 -0000 1.5.2.2
@@ -24,4 +24,4 @@
SET(PYTHONINTERP_FOUND ON)
ENDIF(PYTHON_EXECUTABLE)
-
+MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
Index: KDE3Macros.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/KDE3Macros.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- KDE3Macros.cmake 13 Oct 2006 14:52:01 -0000 1.2.2.2
+++ KDE3Macros.cmake 25 Oct 2007 18:03:48 -0000 1.2.2.3
@@ -321,7 +321,7 @@
FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
- INSTALL_FILES(/lib/kde3 FILES ${_laname})
+ INSTALL_FILES(${KDE3_LIBTOOL_DIR} FILES ${_laname})
ENDMACRO(KDE3_INSTALL_LIBTOOL_FILE)
@@ -334,7 +334,7 @@
ENDMACRO(KDE3_CREATE_FINAL_FILE)
-OPTION(KDE3_ENABLE_FINAL "Enable final all-in-one compilation")
+# OPTION(KDE3_ENABLE_FINAL "Enable final all-in-one compilation")
OPTION(KDE3_BUILD_TESTS "Build the tests")
@@ -346,12 +346,7 @@
SET(_first_SRC ${_with_PREFIX})
ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX")
- IF (KDE3_ENABLE_FINAL)
- KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN})
- ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp)
- ELSE (KDE3_ENABLE_FINAL)
ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
- ENDIF (KDE3_ENABLE_FINAL)
IF(_first_SRC)
SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "")
@@ -364,12 +359,7 @@
MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
- IF (KDE3_ENABLE_FINAL)
- KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
- ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp)
- ELSE (KDE3_ENABLE_FINAL)
ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} )
- ENDIF (KDE3_ENABLE_FINAL)
CONFIGURE_FILE(${KDE3_MODULE_DIR}/kde3init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
@@ -381,12 +371,7 @@
MACRO(KDE3_ADD_EXECUTABLE _target_NAME )
- IF (KDE3_ENABLE_FINAL)
- KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
- ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp)
- ELSE (KDE3_ENABLE_FINAL)
ADD_EXECUTABLE(${_target_NAME} ${ARGN} )
- ENDIF (KDE3_ENABLE_FINAL)
ENDMACRO(KDE3_ADD_EXECUTABLE)
Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- FindKDE3.cmake 27 Oct 2006 20:01:46 -0000 1.3.2.2
+++ FindKDE3.cmake 25 Oct 2007 18:03:48 -0000 1.3.2.3
@@ -13,7 +13,6 @@
#
# The following user adjustable options are provided:
#
-# KDE3_ENABLE_FINAL - enable this for KDE-style enable-final all-in-one compilation
# KDE3_BUILD_TESTS - enable this to build KDE testcases
#
#
@@ -47,18 +46,20 @@
# This will create and install a simple libtool file for the given target.
#
# KDE3_ADD_EXECUTABLE(name file1 ... fileN )
-# Equivalent to ADD_EXECUTABLE(), but additionally supports KDE3_ENABLE_FINAL
+# Currently identical to ADD_EXECUTABLE(), may provide some advanced features in the future.
#
# KDE3_ADD_KPART(name [WITH_PREFIX] file1 ... fileN )
# Create a KDE plugin (KPart, kioslave, etc.) from the given source files.
-# It supports KDE3_ENABLE_FINAL
# If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't.
# It creates and installs an appropriate libtool la-file.
#
# KDE3_ADD_KDEINIT_EXECUTABLE(name file1 ... fileN )
# Create a KDE application in the form of a module loadable via kdeinit.
# A library named kdeinit_<name> will be created and a small executable which links to it.
-# It supports KDE3_ENABLE_FINAL
+#
+# The option KDE3_ENABLE_FINAL to enable all-in-one compilation is
+# no longer supported.
+#
#
# Author: Alexander Neundorf <neundorf at kde.org>
@@ -75,8 +76,6 @@
FIND_PACKAGE(X11 REQUIRED)
-SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} kdecore)
-
#add some KDE specific stuff
SET(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -D_GNU_SOURCE)
@@ -167,8 +166,18 @@
FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore)
+SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
+
GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
+IF(NOT KDE3_LIBTOOL_DIR)
+ IF(KDE3_KDECORE_LIBRARY MATCHES lib64)
+ SET(KDE3_LIBTOOL_DIR /lib64/kde3)
+ ELSE(KDE3_KDECORE_LIBRARY MATCHES lib64)
+ SET(KDE3_LIBTOOL_DIR /lib/kde3)
+ ENDIF(KDE3_KDECORE_LIBRARY MATCHES lib64)
+ENDIF(NOT KDE3_LIBTOOL_DIR)
+
#now search for the dcop utilities
FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl PATHS
$ENV{KDEDIR}/bin
More information about the Cmake-commits
mailing list