From: <le...@us...> - 2004-03-10 13:08:42
|
Update of /cvsroot/rtk/rtk/src/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18156/src/core Modified Files: CMakeLists.txt Log Message: Now Thread and Mutex are properly archived into librtk.a static library. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/rtk/rtk/src/core/CMakeLists.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CMakeLists.txt 5 Mar 2004 18:29:29 -0000 1.11 --- CMakeLists.txt 10 Mar 2004 12:42:47 -0000 1.12 *************** *** 37,41 **** INCLUDE(${CMAKE_ROOT}/Modules/FindThreads.cmake) ! SUBDIRS(platform) SET(RTK_CORE_SFILES --- 37,43 ---- 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. ! #SUBDIRS(platform) SET(RTK_CORE_SFILES *************** *** 45,53 **** ) ! # 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 ... --- 47,66 ---- ) ! ##------------------------------------------------------------------- ! # Platform-specific sources ! # GNU/Linux ! SET(RTK_CORE_LINUX_SFILES ! platform/linux/Thread.cpp platform/linux/Mutex.cpp ! ) ! # Windows ! SET(RTK_CORE_WIN32_SFILES ! platform/win32/Thread.cpp platform/win32/Mutex.cpp ! ) ! ! IF (WIN32) ! SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} ${RTK_CORE_WIN32_SFILES}) ! ELSE (WIN32) ! SET(RTK_CORE_SFILES ${RTK_CORE_SFILES} ${RTK_CORE_LINUX_SFILES}) ! ENDIF (WIN32) # This is good for VisualStudio ... *************** *** 55,59 **** ADD_LIBRARY(${RTK_LIBRTK} STATIC ${RTK_CORE_SFILES}) ! ## FLAGS # How each, separate file in CORE RTK library should be compiles. --- 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 compiles. |