[Sdif-cvs] SDIF CMakeLists.txt,1.24,1.25

[Axel R. <ro...@us...>]

Update of /cvsroot/sdif/SDIF
In directory vz-cvs-3.sog:/tmp/cvs-serv7823

Modified Files:
	CMakeLists.txt 
Log Message:
Reuse simple configure_file function because we finally don't need the more advanced
regexp mechanism.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/SDIF/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CMakeLists.txt	11 Jun 2011 23:23:10 -0000	1.24
--- CMakeLists.txt	11 Jun 2011 23:39:38 -0000	1.25
***************
*** 295,313 ****
  
  CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif_version.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h)
! 
! #CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
! FILE(READ ${PROJECT_SOURCE_DIR}/include/sdif.h.in SDIF_H_CONFIG)
! STRING(REGEX REPLACE "#undef[ \t]*\([^ \t\n\r]*\)" "#cmakedefine \\1 @\\1@" SDIF_H_CMCONFIG ${SDIF_H_CONFIG})
! STRING(CONFIGURE ${SDIF_H_CMCONFIG} SDIF_H_CMCONFIGURED)
! 
! IF(EXISTS ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
!   FILE(READ ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h CURRENT_SDIF_H)
! ENDIF(EXISTS ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
! 
! IF(NOT "${CURRENT_SDIF_H}" STREQUAL "${SDIF_H_CMCONFIGURED}")
!   MESSAGE(STATUS "Writing sdif.h")
!   FILE(WRITE ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h ${SDIF_H_CMCONFIGURED})
! ENDIF(NOT "${CURRENT_SDIF_H}" STREQUAL "${SDIF_H_CMCONFIGURED}")
! 
  
  # include special traget to remove cache, system and compiler info
--- 295,299 ----
  
  CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif_version.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h)
! CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif.h)
  
  # include special traget to remove cache, system and compiler info