Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 23, 2008, 10:55:28 PM (16 years ago)
Author:
rgrieder
Message:
  • tolua working directory is now bin/lib/ again
  • commented dependency code in cmake for tolua_bind.*, has yet to be tested on windows cmake.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cmake/src/orxonox/CMakeLists.txt

    r1147 r1148  
    3131#  objects/weapon/WeaponStation.cc
    3232  tolua/tolua_bind.cc
    33   tolua/tolua_bind.h
     33#  tolua/tolua_bind.h
    3434)
    3535
    36 SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
    37   PROPERTIES
    38   OBJECT_DEPENDS tolua/tolua_bind.h
    39   OBJECT_DEPENDS tolua/tolua_bind.cc
    40   GENERATED true
    41   HEADER_FILE_ONLY true
    42 )
     36#SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
     37#  PROPERTIES
     38#  OBJECT_DEPENDS tolua/tolua_bind.h
     39#  OBJECT_DEPENDS tolua/tolua_bind.cc
     40#  GENERATED true
     41#  HEADER_FILE_ONLY true
     42#)
    4343
    4444GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
    4545ADD_CUSTOM_COMMAND(
    46   OUTPUT tolua/tolua_bind.cc
    47   COMMAND ${TOLUA_EXE} -n orxonox -o orxonox/tolua/tolua_bind.cc -H orxonox/tolua/tolua_bind.h orxonox/tolua/tolua.pkg
     46  OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
     47  COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
    4848  DEPENDS tolua
    49   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
     49  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
    5050)
    5151       
Note: See TracChangeset for help on using the changeset viewer.