From: <de...@us...> - 2004-02-23 22:50:24
|
Update of /cvsroot/rtk/rtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9383 Modified Files: CMakeLists.txt Log Message: Improved CMakeLists.txt files ... :) Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/rtk/rtk/CMakeLists.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CMakeLists.txt 21 Feb 2004 23:49:04 -0000 1.8 --- CMakeLists.txt 23 Feb 2004 22:36:09 -0000 1.9 *************** *** 30,36 **** PROJECT(RTK C++) SUBDIRS(src test) INCLUDE_DIRECTORIES(${RTK_SOURCE_DIR} ${RTK_SOURCE_DIR}/rtk . ..) - MESSAGE("Root of RTK source tree: ${RTK_SOURCE_DIR}") ## --- 30,39 ---- PROJECT(RTK C++) + # We will INSIST on CMake version 1.8 and higher... + CMAKE_MINIMUM_REQUIRED(VERSION 1.8) + SUBDIRS(src test) + INCLUDE_DIRECTORIES(${RTK_SOURCE_DIR} ${RTK_SOURCE_DIR}/rtk . ..) ## *************** *** 38,48 **** #################################################################### OPTION(RTK_OPT_DEBUG ! "Builder RTK using debugging code" ! ON) OPTION(RTK_OPT_UNICODE ! "Build RTK with UNICODE support" ! ON) ## --- 41,58 ---- #################################################################### + # Shall Debug symbols be in produced libraries/executables? OPTION(RTK_OPT_DEBUG ! "Build RTK using debugging code" ! ON) + # Determines whather RTK will be built with or without UNICODE support OPTION(RTK_OPT_UNICODE ! "Build RTK with UNICODE support" ! ON) ! ! # Create LOG file ! OPTION(RTK_OPT_BCLOG ! "Create LOG file during the build process" ! ON) ## *************** *** 61,73 **** #################################################################### ! IF(RTK_OPT_UNICODE) ADD_DEFINITIONS(-DUNICODE=1) ! SET(BUILD_CONF_UNICODE 1) SET(RTK_LIB_SUFFIX _u) ! ELSE(RTK_OPT_UNICODE) SET(RTK_LIB_SUFFIX ) ! ENDIF(RTK_OPT_UNICODE) ! IF(WIN32) IF(CMAKE_COMPILER_IS_MINGW) SET(CMAKE_CXX_COMPILER mingw32-g++.exe) --- 71,86 ---- #################################################################### ! IF (RTK_OPT_UNICODE) ADD_DEFINITIONS(-DUNICODE=1) ! SET(RTK_BC_UNICODE 1) SET(RTK_LIB_SUFFIX _u) ! ELSE (RTK_OPT_UNICODE) SET(RTK_LIB_SUFFIX ) ! ENDIF (RTK_OPT_UNICODE) ! # g++ is default C++ compiler ! SET(CMAKE_CXX_COMPILER g++) ! ! IF (WIN32) IF(CMAKE_COMPILER_IS_MINGW) SET(CMAKE_CXX_COMPILER mingw32-g++.exe) *************** *** 83,89 **** ADD_DEFINITIONS(-D_UNICODE) # Needed for Windows UNICODE support ENDIF(BUILD_CONF_UNICODE) - ELSE(WIN32) SET(CMAKE_CXX_COMPILER g++) ! ENDIF(WIN32) ADD_DEFINITIONS(-D_RTK_HAVE_CONF_H_) --- 96,101 ---- ADD_DEFINITIONS(-D_UNICODE) # Needed for Windows UNICODE support ENDIF(BUILD_CONF_UNICODE) SET(CMAKE_CXX_COMPILER g++) ! ENDIF (WIN32) ADD_DEFINITIONS(-D_RTK_HAVE_CONF_H_) *************** *** 99,103 **** --- 111,127 ---- SET(RTK_LIBRTK rtk${RTK_LIB_SUFFIX}) + FILE(APPEND filename "message to write"... ) + + ## + # Log + #################################################################### + IF (RTK_OPT_BCLOG) + SET(RTK_BC_LOGFILE ${RTK_SOURCE_DIR}/doc/rtk_bc_log.txt) + # Note: This must be THE FIRST WRITE to logfile! :) + FILE(WRITE ${RTK_BC_LOGFILE} "Root of RTK source tree: ${RTK_SOURCE_DIR}\n") + FILE(APPEND ${RTK_BC_LOGFILE} "Static RTK CORE library: ${RTK_LIBRTK}.a\n") + ENDIF (RTK_OPT_BCLOG) + ## # $Id$ |