Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8341


Ignore:
Timestamp:
Apr 27, 2011, 2:34:12 AM (9 years ago)
Author:
rgrieder
Message:

Added new library linking keywords for the Add Target Command.
That makes OS specific library linking less tedious to read.

Location:
code/branches/kicklib2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib2/cmake/tools/TargetUtilities.cmake

    r8319 r8341  
    4343 #    Lists:
    4444 #      LINK_LIBRARIES:    Redirects to TARGET_LINK_LIBRARIES
     45 #      LINK_LIBS_LINUX:   Redirects to TARGET_LINK_LIBRARIES only on Linux
     46 #      LINK_LIBS_WIN32:   Redirects to TARGET_LINK_LIBRARIES only on Windows
     47 #      LINK_LIBS_APPLE:   Redirects to TARGET_LINK_LIBRARIES only on Apple
     48 #      LINK_LIBS_UNIX:    Redirects to TARGET_LINK_LIBRARIES only on UNIX
    4549 #      VERSION:           Set version to the binary
    4650 #      SOURCE_FILES:      Source files for the target
     
    8690  SET(_list_names LINK_LIBRARIES     VERSION           SOURCE_FILES
    8791                  DEFINE_SYMBOL      TOLUA_FILES       PCH_FILE
    88                   PCH_EXCLUDE        OUTPUT_NAME)
     92                  PCH_EXCLUDE        OUTPUT_NAME       LINK_LIBS_LINUX
     93                  LINK_LIBS_WIN32    LINK_LIBS_APPLE   LINK_LIBS_UNIX)
    8994
    9095  PARSE_MACRO_ARGUMENTS("${_switches}" "${_list_names}" ${ARGN})
     
    286291    TARGET_LINK_LIBRARIES(${_target_name} ${_arg_LINK_LIBRARIES})
    287292  ENDIF()
     293  IF(_arg_LINK_LIBS_LINUX AND LINUX)
     294    TARGET_LINK_LIBRARIES(${_target_name} ${_arg_LINK_LIBS_LINUX})
     295  ENDIF()
     296  IF(_arg_LINK_LIBS_WIN32 AND WIN32)
     297    TARGET_LINK_LIBRARIES(${_target_name} ${_arg_LINK_LIBS_WIN32})
     298  ENDIF()
     299  IF(_arg_LINK_LIBS_APPLE AND APPLE)
     300    TARGET_LINK_LIBRARIES(${_target_name} ${_arg_LINK_LIBS_APPLE})
     301  ENDIF()
     302  IF(_arg_LINK_LIBS_UNIX AND UNIX)
     303    TARGET_LINK_LIBRARIES(${_target_name} ${_arg_LINK_LIBS_UNIX})
     304  ENDIF()
    288305
    289306  # RPATH settings for the installation
  • code/branches/kicklib2/src/external/enet/CMakeLists.txt

    r8339 r8341  
    4444ADD_COMPILER_FLAGS("-DHAS_POLL -DHAS_FCNTL -DHAS_MSGHDR_FLAGS -DHAS_SOCKLEN_T")
    4545
    46 IF(WIN32)
    47     SET(ENET_WIN_LIBS odbc32 odbccp32 winmm ws2_32)
    48 ENDIF()
    49 
    5046ORXONOX_ADD_LIBRARY(enet_orxonox
    5147    ORXONOX_EXTERNAL
    52     VERSION        1.3.0
    53     DEFINE_SYMBOL  "ENET_BUILDING_LIB"
    54     LINK_LIBRARIES ${ENET_WIN_LIBS}
    55     SOURCE_FILES   ${ENET_FILES}
     48    VERSION         1.3.0
     49    DEFINE_SYMBOL   "ENET_BUILDING_LIB"
     50    LINK_LIBS_WIN32 odbc32 odbccp32 winmm ws2_32
     51    SOURCE_FILES    ${ENET_FILES}
    5652)
  • code/branches/kicklib2/src/external/ois/CMakeLists.txt

    r8338 r8341  
    6464  VERSION
    6565    1.3
     66  LINK_LIBS_WIN32
     67    ${DIRECTX_LIBRARIES}
     68    ${WMI_LIBRARY}
     69  LINK_LIBS_APPLE
     70    /System/Library/Frameworks/IOKit.framework
     71    /System/Library/Frameworks/Carbon.framework
     72  LINK_LIBS_LINUX
     73    X11
    6674  SOURCE_FILES
    6775    ${OIS_FILES}
    6876)
    69 
    70 IF(WIN32)
    71   TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES} ${WMI_LIBRARY})
    72 ELSEIF(APPLE)
    73   TARGET_LINK_LIBRARIES(ois_orxonox "/System/Library/Frameworks/IOKit.framework" "/System/Library/Frameworks/Carbon.framework")
    74 ENDIF()
  • code/branches/kicklib2/src/libraries/core/CMakeLists.txt

    r8283 r8341  
    104104    tinyxml_orxonox
    105105    util
     106  LINK_LIBS_UNIX
     107    dl
     108    pthread
    106109  SOURCE_FILES
    107110    ${CORE_SRC_FILES}
Note: See TracChangeset for help on using the changeset viewer.