[Sdif-cvs] SDIF CMakeLists.txt,1.6,1.7

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

Update of /cvsroot/sdif/SDIF
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10574

Modified Files:
	CMakeLists.txt 
Log Message:
Use PROJECT_xxx local variables instead of CMAKE_CURRENT_xxx.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/SDIF/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CMakeLists.txt	15 Dec 2006 14:02:54 -0000	1.6
--- CMakeLists.txt	18 Dec 2006 15:07:34 -0000	1.7
***************
*** 33,37 ****
  PROJECT(SDIF)
  
! FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/configure.in CONFIGIN)
  STRING(REGEX REPLACE ".*SDIF_VERSION_MAJOR=\([0-9]+\).*" "\\1" SDIF_VERSION_MAJOR ${CONFIGIN})
  STRING(REGEX REPLACE ".*SDIF_VERSION_MINOR=\([0-9]+\).*" "\\1" SDIF_VERSION_MINOR ${CONFIGIN})
--- 33,37 ----
  PROJECT(SDIF)
  
! FILE(READ ${PROJECT_SOURCE_DIR}/configure.in CONFIGIN)
  STRING(REGEX REPLACE ".*SDIF_VERSION_MAJOR=\([0-9]+\).*" "\\1" SDIF_VERSION_MAJOR ${CONFIGIN})
  STRING(REGEX REPLACE ".*SDIF_VERSION_MINOR=\([0-9]+\).*" "\\1" SDIF_VERSION_MINOR ${CONFIGIN})
***************
*** 49,53 ****
  SET(CMAKE_VERBOSE_MAKEFILE false)
  SET(CMAKE_SKIP_RPATH OFF)
! SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmModules)
  
  
--- 49,53 ----
  SET(CMAKE_VERBOSE_MAKEFILE false)
  SET(CMAKE_SKIP_RPATH OFF)
! SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmModules)
  
  
***************
*** 180,197 ****
  
  #CONFIGURE_FILE(SDIF/sdif/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config/config.h)
! FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/sdif/config.h.in CONFIG)
  STRING(REGEX REPLACE "#undef[ \t]*\([^ \t\n\r]*\)" "#cmakedefine \\1 @\\1@" SDIFCMCONFIG ${CONFIG})
  STRING(CONFIGURE ${SDIFCMCONFIG} SDIFCMCONFIGURED)
  
! IF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/sdifconfig/config.h)
!   FILE(READ ${CMAKE_CURRENT_BINARY_DIR}/sdifconfig/config.h CURRENTCONFIG)
! ENDIF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/sdifconfig/config.h)
  
  IF(NOT "${CURRENTCONFIG}" STREQUAL "${SDIFCMCONFIGURED}")
    MESSAGE("Writing sdif config")
!   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/sdifconfig/config.h ${SDIFCMCONFIGURED})
  ENDIF(NOT "${CURRENTCONFIG}" STREQUAL "${SDIFCMCONFIGURED}")
  
! CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/sdif_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/sdifconfig/sdif_version.h)
  
  # include special traget to remove cache, system and compiler info
--- 180,197 ----
  
  #CONFIGURE_FILE(SDIF/sdif/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config/config.h)
! FILE(READ ${PROJECT_SOURCE_DIR}/sdif/config.h.in CONFIG)
  STRING(REGEX REPLACE "#undef[ \t]*\([^ \t\n\r]*\)" "#cmakedefine \\1 @\\1@" SDIFCMCONFIG ${CONFIG})
  STRING(CONFIGURE ${SDIFCMCONFIG} SDIFCMCONFIGURED)
  
! IF(EXISTS ${PROJECT_BINARY_DIR}/sdifconfig/config.h)
!   FILE(READ ${PROJECT_BINARY_DIR}/sdifconfig/config.h CURRENTCONFIG)
! ENDIF(EXISTS ${PROJECT_BINARY_DIR}/sdifconfig/config.h)
  
  IF(NOT "${CURRENTCONFIG}" STREQUAL "${SDIFCMCONFIGURED}")
    MESSAGE("Writing sdif config")
!   FILE(WRITE ${PROJECT_BINARY_DIR}/sdifconfig/config.h ${SDIFCMCONFIGURED})
  ENDIF(NOT "${CURRENTCONFIG}" STREQUAL "${SDIFCMCONFIGURED}")
  
! CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/include/sdif_version.h.in ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h)
  
  # include special traget to remove cache, system and compiler info
***************
*** 208,212 ****
  ADD_DEFINITIONS("-DHAVE_CONFIG_H")
  
! INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/sdifconfig ${CMAKE_CURRENT_BINARY_DIR}/sdif ${CMAKE_CURRENT_SOURCE_DIR}/include  )
  
  ADD_SUBDIRECTORY( sdif ) 
--- 208,212 ----
  ADD_DEFINITIONS("-DHAVE_CONFIG_H")
  
! INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/sdifconfig ${PROJECT_BINARY_DIR}/sdif ${PROJECT_SOURCE_DIR}/include  )
  
  ADD_SUBDIRECTORY( sdif ) 
***************
*** 242,253 ****
    SET(libdir ${CMAKE_INSTALL_PREFIX}/lib)
    SET(includedir ${CMAKE_INSTALL_PREFIX}/include)
!   CONFIGURE_FILE(sdif.pc.in   ${CMAKE_CURRENT_BINARY_DIR}/sdif.pc )
!   INSTALL(FILES  ${CMAKE_CURRENT_BINARY_DIR}/sdif.pc DESTINATION ${PKGCONFIGPATH} )
  ENDIF(NOT CMAKE_BUILD_TYPE MATCHES debug)
  
  
  # install sdif headers
! INSTALL(FILES  ${CMAKE_CURRENT_BINARY_DIR}/sdifconfig/sdif_version.h DESTINATION ${INSTALL_INC_DIR})
! INSTALL(FILES  ${CMAKE_CURRENT_SOURCE_DIR}/include/sdif.h DESTINATION ${INSTALL_INC_DIR})
  
  
--- 242,253 ----
    SET(libdir ${CMAKE_INSTALL_PREFIX}/lib)
    SET(includedir ${CMAKE_INSTALL_PREFIX}/include)
!   CONFIGURE_FILE(sdif.pc.in   ${PROJECT_BINARY_DIR}/sdif.pc )
!   INSTALL(FILES  ${PROJECT_BINARY_DIR}/sdif.pc DESTINATION ${PKGCONFIGPATH} )
  ENDIF(NOT CMAKE_BUILD_TYPE MATCHES debug)
  
  
  # install sdif headers
! INSTALL(FILES  ${PROJECT_BINARY_DIR}/sdifconfig/sdif_version.h DESTINATION ${INSTALL_INC_DIR})
! INSTALL(FILES  ${PROJECT_SOURCE_DIR}/include/sdif.h DESTINATION ${INSTALL_INC_DIR})
  
  
***************
*** 256,260 ****
  
  
! IF("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    MESSAGE("===================================================================")
    MESSAGE("Option summary:")
--- 256,260 ----
  
  
! IF("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    MESSAGE("===================================================================")
    MESSAGE("Option summary:")
***************
*** 280,283 ****
    MESSAGE("pkgconfig      : ${PKGCONFIGPATH}")
    MESSAGE("===================================================================")
! ENDIF("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
  
--- 280,283 ----
    MESSAGE("pkgconfig      : ${PKGCONFIGPATH}")
    MESSAGE("===================================================================")
! ENDIF("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")