Re: [devel] RFC: %cmake

[Andrey Rahmatullin <wrar@altlinux.ru>]

[-- Attachment #1.1: Type: text/plain, Size: 1493 bytes --]

On Mon, Nov 23, 2009 at 02:11:58AM +0300, Dmitry V. Levin wrote:
> Please fix build of cdrkit-1.1.9.832-alt3:
> 
> In file included from /usr/src/RPM/BUILD/cdrkit-1.1.9.832/libunls/nls_base.c:42:
> /usr/src/RPM/BUILD/cdrkit-1.1.9.832/libunls/../include/mconfig.h:59:70: error: xconfig.h: No such file or directory
Готово. На старых cmake, правда, собираться не будет, но изменение
для получения универсального патча тривиально (сейчас патч меняет старый
путь на новый, вместо этого можно добавлять новый, оставляя старый).

Раньше configure_file() клал результаты в корень бинарного дерева, сейчас
сохраняет пути:

Teach configure_file to handle relative paths

The configure_file() command now converts relative output paths to full
paths using the current binary directory.  Input relative paths were
already converted using the current source directory, but this behavior
was not previously documented.

http://public.kitware.com/cgi-bin/viewcvs.cgi/Source/cmConfigureFileCommand.cxx?revision=1.36&root=CMake&view=markup

Кажется, обычно это незаметно, т.к. config.h.in лежит в корне. В cdrkit
xconfig.h.in лежит в /include и до 2.8.0 xconfig.h создавался в /build/, а
теперь создаётся в /build/include/.

-- 
WBR, wRAR (ALT Linux Team)
Powered by the ALT Linux fortune(6):

> Да ты никак на памятник при жизни набиваешься, от встроенных
> пользователей? ;-)
Ну, это... (скромно потупив взор)... не первый.
В смысле, памятник :-)
		-- morozov in sisyphus@

[-- Attachment #1.2: cdrkit-1.1.9-alt-cmake2.8-fix.patch --]
[-- Type: text/plain, Size: 5862 bytes --]

diff --git a/cdrkit/genisoimage/CMakeLists.txt b/cdrkit/genisoimage/CMakeLists.txt
index 8ea911e..2b552bd 100644
--- a/cdrkit/genisoimage/CMakeLists.txt
+++ b/cdrkit/genisoimage/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT (MKISOFS C)
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
 
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}/include)
 
 INCLUDE(CheckIncludeFiles)
 CHECK_INCLUDE_FILES("magic.h" USE_MAGIC)
diff --git a/cdrkit/icedax/CMakeLists.txt b/cdrkit/icedax/CMakeLists.txt
index 79b99ec..924d79b 100644
--- a/cdrkit/icedax/CMakeLists.txt
+++ b/cdrkit/icedax/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (icedax C)
-INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR}/include)
 include(../include/AddScgBits.cmake)
 include(../include/AddSchilyBits.cmake)
 include(../include/AddNetworkBits.cmake)
diff --git a/cdrkit/libedc/CMakeLists.txt b/cdrkit/libedc/CMakeLists.txt
index e33a5b5..c267864 100644
--- a/cdrkit/libedc/CMakeLists.txt
+++ b/cdrkit/libedc/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBEDC C)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR}/include)
 
 AUX_SOURCE_DIRECTORY(. LIBEDC_SRCS)
 
diff --git a/cdrkit/libhfs_iso/CMakeLists.txt b/cdrkit/libhfs_iso/CMakeLists.txt
index bae664c..30d8cb1 100644
--- a/cdrkit/libhfs_iso/CMakeLists.txt
+++ b/cdrkit/libhfs_iso/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBhfs_iso C)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}/include)
 ADD_DEFINITIONS(-DUSE_LARGEFILES -DABORT_DEEP_ISO_ONLY -DAPPLE_HYB -DUDF -DDVD_VIDEO -DSORTING -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG)
 
 
diff --git a/cdrkit/libparanoia/CMakeLists.txt b/cdrkit/libparanoia/CMakeLists.txt
index 006ae0a..94847e4 100644
--- a/cdrkit/libparanoia/CMakeLists.txt
+++ b/cdrkit/libparanoia/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBparanoia C)
-INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../wodim)
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR}/include ../wodim)
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 SET(LIBparanoia_SRCS gap.c isort.c overlap.c p_block.c paranoia.c pmalloc.c)
 
diff --git a/cdrkit/librols/CMakeLists.txt b/cdrkit/librols/CMakeLists.txt
index 2158f94..427ca8c 100644
--- a/cdrkit/librols/CMakeLists.txt
+++ b/cdrkit/librols/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBROLS C)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim)
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR}/include ../wodim)
 
 SET(LIBROLS_SRCS  astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c  stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/peekc.c default.c)
 
diff --git a/cdrkit/libunls/CMakeLists.txt b/cdrkit/libunls/CMakeLists.txt
index 6faf636..48bd75d 100644
--- a/cdrkit/libunls/CMakeLists.txt
+++ b/cdrkit/libunls/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBunls C)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../wodim ${CMAKE_BINARY_DIR}/include)
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
     IF(HAVE_ICONV_H)
diff --git a/cdrkit/libusal/CMakeLists.txt b/cdrkit/libusal/CMakeLists.txt
index 1e59dc5..2e87017 100644
--- a/cdrkit/libusal/CMakeLists.txt
+++ b/cdrkit/libusal/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (LIBSCG C)
-INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR}/include)
 include(../include/AddScgBits.cmake)
 ADD_DEFINITIONS(-DUSE_RCMD_RSH)
 
diff --git a/cdrkit/netscsid/CMakeLists.txt b/cdrkit/netscsid/CMakeLists.txt
index 9d2263c..8eaab8c 100644
--- a/cdrkit/netscsid/CMakeLists.txt
+++ b/cdrkit/netscsid/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (netscsid C)
-INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} )
+INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR}/include )
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
 INCLUDE(../include/AddNetworkBits.cmake)
diff --git a/cdrkit/readom/CMakeLists.txt b/cdrkit/readom/CMakeLists.txt
index 35a7b6d..a71e2fc 100644
--- a/cdrkit/readom/CMakeLists.txt
+++ b/cdrkit/readom/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (READECD C)
-INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR}/include)
 INCLUDE(../include/AddScgBits.cmake)
 INCLUDE(../include/AddSchilyBits.cmake)
 
diff --git a/cdrkit/wodim/CMakeLists.txt b/cdrkit/wodim/CMakeLists.txt
index 80f3f12..1cb97f5 100644
--- a/cdrkit/wodim/CMakeLists.txt
+++ b/cdrkit/wodim/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT (CDRECORD C)
-INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR}/include)
 INCLUDE(../include/AddScgBits.cmake)
 include(../include/AddSchilyBits.cmake)
 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]