From: <le...@us...> - 2004-03-05 18:51:39
|
Update of /cvsroot/rtk/rtk/src/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30999 Modified Files: CMakeLists.txt Log Message: Added code that checks for threads. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/CMakeLists.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CMakeLists.txt 26 Feb 2004 21:52:28 -0000 1.10 --- CMakeLists.txt 5 Mar 2004 18:29:29 -0000 1.11 *************** *** 33,47 **** #################################################################### SET(RTK_CORE_SFILES SList.cpp Dict.cpp debug.cpp error.cpp String.cpp Array.cpp ! rchar.cpp Vector.cpp ) # T0D0: I had problems in MinGW so i decided to exclude Variant.cpp there. # Sure, this should be fixed. ! IF(NOT CMAKE_COMPILER_IS_MINGW) ! SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} Variant.cpp) ! ENDIF(NOT CMAKE_COMPILER_IS_MINGW) # This is good for VisualStudio ... --- 33,53 ---- #################################################################### + ##------------------------------------------------------------------- + # Let's get info about Threads + INCLUDE(${CMAKE_ROOT}/Modules/FindThreads.cmake) + + SUBDIRS(platform) + SET(RTK_CORE_SFILES SList.cpp Dict.cpp debug.cpp error.cpp String.cpp Array.cpp ! rchar.cpp Vector.cpp Variant.cpp ) # T0D0: I had problems in MinGW so i decided to exclude Variant.cpp there. # Sure, this should be fixed. ! #IF(NOT CMAKE_COMPILER_IS_MINGW) ! # SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} Variant.cpp) ! #ENDIF(NOT CMAKE_COMPILER_IS_MINGW) # This is good for VisualStudio ... *************** *** 60,66 **** --- 66,78 ---- COMPILE_FLAGS -D_DEBUG COMPILE_FLAGS -DDEBUG + COMPILE_FLAGS ${CMAKE_THREAD_LIBS_INIT} ) ENDIF (RTK_OPT_DEBUG) + # Threads + SET_SOURCE_FILES_PROPERTIES(${RTK_CORE_SFILES} + COMPILE_FLAGS ${CMAKE_THREAD_LIBS_INIT} + ) + IF (RTK_OPT_UNICODE) SET_SOURCE_FILES_PROPERTIES(${RTK_CORE_SFILES} *************** *** 70,81 **** ############################################################ FLAGS ## ######### ! ! ######### ! ## LOG ############################################################ IF (RTK_OPT_BCLOG) FILE(APPEND ${RTK_BC_LOGFILE} "Files that go into ${RTK_LIBRTK}.a: ${RTK_CORE_SFILES}\n") ENDIF (RTK_OPT_BCLOG) - ############################################################ LOG ## - ######### ## --- 82,94 ---- ############################################################ FLAGS ## ######### ! ! ! ##------------------------------------------------------------------- ! # LOG ! # IF (RTK_OPT_BCLOG) FILE(APPEND ${RTK_BC_LOGFILE} "Files that go into ${RTK_LIBRTK}.a: ${RTK_CORE_SFILES}\n") + WRITE_FILE(${RTK_BC_LOGFILE} "Threads link-flags: ${CMAKE_THREAD_LIBS_INIT}\n" APPEND) ENDIF (RTK_OPT_BCLOG) ## |