[Debburn-changes] r490 - in cdrkit/trunk: . include librols libusal
wodim
Eduard Bloch
blade at alioth.debian.org
Sun Nov 26 15:40:42 CET 2006
Author: blade
Date: 2006-11-26 15:40:42 +0100 (Sun, 26 Nov 2006)
New Revision: 490
Modified:
cdrkit/trunk/CMakeLists.txt
cdrkit/trunk/include/AddSchilyBits.cmake
cdrkit/trunk/librols/CMakeLists.txt
cdrkit/trunk/libusal/CMakeLists.txt
cdrkit/trunk/wodim/CMakeLists.txt
Log:
Renamed the binary name of libschily to librols
Modified: cdrkit/trunk/CMakeLists.txt
===================================================================
--- cdrkit/trunk/CMakeLists.txt 2006-11-26 13:44:14 UTC (rev 489)
+++ cdrkit/trunk/CMakeLists.txt 2006-11-26 14:40:42 UTC (rev 490)
@@ -1,3 +1,3 @@
PROJECT (cdrkit)
-SUBDIRS(wodim libdeflt libedc libhfs_iso libparanoia icedax libusal librols libunls genisoimage readom netscsid 3rd-party/dirsplit include)
+SUBDIRS(include wodim libdeflt libedc libhfs_iso libparanoia icedax libusal librols libunls genisoimage readom netscsid 3rd-party/dirsplit)
Modified: cdrkit/trunk/include/AddSchilyBits.cmake
===================================================================
--- cdrkit/trunk/include/AddSchilyBits.cmake 2006-11-26 13:44:14 UTC (rev 489)
+++ cdrkit/trunk/include/AddSchilyBits.cmake 2006-11-26 14:40:42 UTC (rev 490)
@@ -1,30 +1,7 @@
-IF(NOT CHECKED_SCHILY)
- SET(CHECKED_SCHILY 1)
+IF(NOT CHECKED_rols)
+ SET(CHECKED_rols 1)
- INCLUDE(CheckCSourceCompiles)
- LIST(APPEND EXTRA_LIBS "schily")
+ LIST(APPEND EXTRA_LIBS "rols")
+ENDIF(NOT CHECKED_rols)
- SET(TESTSRC "
- #include <math.h>
- int main() { return isnan(1); }
- ")
-
- SET(CMAKE_REQUIRED_LIBRARIES )
- CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_LIBC_ISNAN)
-
- #//#define HAVE_ISNAN 1 /* isnan() is present in libc or libm */
- # assuming that, see xconfig.h.in, until we meet an OS where is no
- # native isnan(...) function available
-
- IF(NOT HAVE_LIBC_ISNAN)
- SET(CMAKE_REQUIRED_LIBRARIES m)
- LIST(APPEND EXTRA_LIBS m)
- CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_LIBM_ISNAN)
- IF(NOT HAVE_LIBM_ISNAN)
- MESSAGE(FATAL_ERROR "isnan function not found anywhere on ${CMAKE_SYSTEM_NAME}")
- ENDIF(NOT HAVE_LIBM_ISNAN)
- ENDIF(NOT HAVE_LIBC_ISNAN)
-
-ENDIF(NOT CHECKED_SCHILY)
-
Modified: cdrkit/trunk/librols/CMakeLists.txt
===================================================================
--- cdrkit/trunk/librols/CMakeLists.txt 2006-11-26 13:44:14 UTC (rev 489)
+++ cdrkit/trunk/librols/CMakeLists.txt 2006-11-26 14:40:42 UTC (rev 490)
@@ -1,7 +1,7 @@
-PROJECT (LIBSCHILY)
+PROJECT (LIBROLS)
INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../wodim)
-SET(LIBSCHILY_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/fcons64.c stdio/fdown.c stdio/fdup.c stdio/fdup64.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/fgetstr.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/fileluopen64.c stdio/filemopen.c stdio/filemopen64.c stdio/fileopen.c stdio/fileopen64.c stdio/filepos.c stdio/filepos64.c stdio/fileread.c stdio/filereopen.c stdio/filereopen64.c stdio/fileseek.c stdio/fileseek64.c stdio/filesize.c stdio/filesize64.c stdio/filestat.c stdio/filestat64.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/openfd64.c stdio/peekc.c )
+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/fcons64.c stdio/fdown.c stdio/fdup.c stdio/fdup64.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/fgetstr.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/fileluopen64.c stdio/filemopen.c stdio/filemopen64.c stdio/fileopen.c stdio/fileopen64.c stdio/filepos.c stdio/filepos64.c stdio/fileread.c stdio/filereopen.c stdio/filereopen64.c stdio/fileseek.c stdio/fileseek64.c stdio/filesize.c stdio/filesize64.c stdio/filestat.c stdio/filestat64.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/openfd64.c stdio/peekc.c )
-ADD_LIBRARY (schily STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBSCHILY_SRCS})
+ADD_LIBRARY (rols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS})
Modified: cdrkit/trunk/libusal/CMakeLists.txt
===================================================================
--- cdrkit/trunk/libusal/CMakeLists.txt 2006-11-26 13:44:14 UTC (rev 489)
+++ cdrkit/trunk/libusal/CMakeLists.txt 2006-11-26 14:40:42 UTC (rev 490)
@@ -1,9 +1,9 @@
PROJECT (LIBSCG)
-INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../wodim)
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR})
include(../include/AddScgBits.cmake)
#SET(LIBSCG_SRCS rdummy.c usalsettarget.c usaltimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
SET(LIBSCG_SRCS usalsettarget.c usaltimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c)
LINK_DIRECTORIES(../librols)
ADD_LIBRARY (usal STATIC ${LIBSCG_SRCS})
-TARGET_LINK_LIBRARIES(usal schily ${SCG_SELF_LIBS})
+TARGET_LINK_LIBRARIES(usal ${SCG_SELF_LIBS})
Modified: cdrkit/trunk/wodim/CMakeLists.txt
===================================================================
--- cdrkit/trunk/wodim/CMakeLists.txt 2006-11-26 13:44:14 UTC (rev 489)
+++ cdrkit/trunk/wodim/CMakeLists.txt 2006-11-26 14:40:42 UTC (rev 490)
@@ -5,15 +5,18 @@
AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
-FIND_FILE(CAPTEST "sys/capability.h")
-if(CAPTEST)
+INCLUDE(CheckIncludeFiles)
+
+#force libcap usage on Linux
+CHECK_INCLUDE_FILES("sys/capability.h" HAVE_SYS_CAPABILITY_H)
+IF(HAVE_SYS_CAPABILITY_H)
LIST(APPEND EXTRA_LIBS cap)
-endif(CAPTEST)
+ELSE(HAVE_SYS_CAPABILITY_H)
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ENDIF(HAVE_SYS_CAPABILITY_H)
-if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CAPTEST)
- MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
-endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CAPTEST)
-
LINK_DIRECTORIES(../librols ../libusal ../libdeflt ../libedc)
ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
More information about the Debburn-changes
mailing list