[Rtk-cvs] rtk/src/core CMakeLists.txt,1.16,1.17

[Dejan L. <le...@us...>]

Update of /cvsroot/rtk/rtk/src/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3542

Modified Files:
	CMakeLists.txt 
Log Message:
Small fix in build system...


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/rtk/rtk/src/core/CMakeLists.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CMakeLists.txt	13 Jun 2004 13:52:05 -0000	1.16
--- CMakeLists.txt	13 Jun 2004 14:17:40 -0000	1.17
***************
*** 33,40 ****
   ####################################################################
  
- ##-------------------------------------------------------------------
- # Let's get info about Threads
- INCLUDE(${CMAKE_ROOT}/Modules/FindThreads.cmake)
- 
  #T0D0: For now we will leave this commented until we learn how to
  # add objects from platform/* to $RTK_LIBRTK library.
--- 33,36 ----
***************
*** 45,49 ****
  error.cpp           String.cpp          Array.cpp
  rchar.cpp           Vector.cpp          Variant.cpp
! PriorityQueue.cpp   Queue.cpp		Buffer.cpp
  )
  
--- 41,45 ----
  error.cpp           String.cpp          Array.cpp
  rchar.cpp           Vector.cpp          Variant.cpp
! PriorityQueue.cpp   Buffer.cpp
  )
  
***************
*** 72,75 ****
--- 68,72 ----
  ADD_LIBRARY(${RTK_LIBRTK} STATIC ${RTK_CORE_SFILES})
  MESSAGE("Files: ${RTK_CORE_SFILES}\n")
+ 
  ## FLAGS
   # How each, separate file in CORE RTK library should be compiled.
***************
*** 78,97 ****
   #   CXX flags instead.
   ####################################################################
- IF (RTK_OPT_DEBUG)
-   SET_SOURCE_FILES_PROPERTIES(${RTK_CORE_SFILES}
-     PROPERTIES COMPILE_FLAGS "-D_DEBUG -DDEBUG ${CMAKE_THREAD_LIBS_INIT}"
-   )
- ENDIF (RTK_OPT_DEBUG)
  
! # Threads
! SET_SOURCE_FILES_PROPERTIES(${RTK_CORE_SFILES}
! 	PROPERTIES COMPILE_FLAGS "${CMAKE_THREAD_LIBS_INIT}"
! )
    
  IF (RTK_OPT_UNICODE)
!   SET_SOURCE_FILES_PROPERTIES(${RTK_CORE_SFILES}
!     PROPERTIES COMPILE_FLAGS "-DUNICODE=1"
!   )
  ENDIF (RTK_OPT_UNICODE)
  ############################################################ FLAGS ##
                                                             #########
--- 75,92 ----
   #   CXX flags instead.
   ####################################################################
  
! IF (RTK_OPT_DEBUG)  
!     SET(RTK_CORE_FLAGS "-D_DEBUG -DDEBUG ${CMAKE_THREAD_LIBS_INIT}")
! ENDIF (RTK_OPT_DEBUG)
    
  IF (RTK_OPT_UNICODE)
! 	SET(RTK_CORE_FLAGS "-DUNICODE=1 ${RTK_CORE_FLAGS}")
  ENDIF (RTK_OPT_UNICODE)
+ 
+ # Finally, set flags
+ SET_SOURCE_FILES_PROPERTIES(${RTK_CORE_SFILES}
+ 	PROPERTIES COMPILE_FLAGS ${RTK_CORE_FLAGS}
+ )
+ 
  ############################################################ FLAGS ##
                                                             #########