Last change
on this file since 2274 was
2239,
checked in by rgrieder, 16 years ago
|
Resolved tolua include directory problem in another fashion by adding CMAKE_BINARY_DIR/src to the include directories and adjusting the the include directives. There were some changes necessary in package.lua (it uses the package name as folder to write "#include "core/CommandExecutor.h"").
The problem with the old resolution (-iquotes) was that you could write "#include "Core.h"" in a file that is not in the core, because src/core was effectively added to the list of include directories (just the ones with quotes of course).
|
-
Property svn:eol-style set to
native
|
File size:
1.5 KB
|
Line | |
---|
1 | # Set the search paths for include files |
---|
2 | INCLUDE_DIRECTORIES( |
---|
3 | ${OGRE_INCLUDE_DIR} |
---|
4 | ${CEGUI_INCLUDE_DIR} |
---|
5 | # ${CEGUI_OGRE_INCLUDE_DIR} |
---|
6 | ${ENet_INCLUDE_DIR} |
---|
7 | ${Boost_INCLUDE_DIRS} |
---|
8 | ${OPENAL_INCLUDE_DIR} |
---|
9 | ${ALUT_INCLUDE_DIR} |
---|
10 | ${VORBIS_INCLUDE_DIR} |
---|
11 | ${OGG_INCLUDE_DIR} |
---|
12 | ${LUA_INCLUDE_DIR} |
---|
13 | ${TCL_INCLUDE_PATH} |
---|
14 | ${DirectX_INCLUDE_DIR} |
---|
15 | ${ZLIB_INCLUDE_DIR} |
---|
16 | ) |
---|
17 | |
---|
18 | INCLUDE_DIRECTORIES( |
---|
19 | . |
---|
20 | ois |
---|
21 | orxonox |
---|
22 | tolua |
---|
23 | # Required for tolua bind files that are in the build folder |
---|
24 | ${CMAKE_CURRENT_BINARY_DIR} |
---|
25 | ) |
---|
26 | |
---|
27 | # Set special macro symbols across all libraries |
---|
28 | SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_TICPP") |
---|
29 | |
---|
30 | ADD_SUBDIRECTORY(cpptcl) |
---|
31 | ADD_SUBDIRECTORY(ois) |
---|
32 | ADD_SUBDIRECTORY(tinyxml) |
---|
33 | ADD_SUBDIRECTORY(tolua) |
---|
34 | |
---|
35 | # TODO: write include file for this stuff |
---|
36 | # Some people may not have CEGUILua installed, espc. with version 0.5 |
---|
37 | # And we don't know what lua version it was linked against, so we compile |
---|
38 | # it ourselves. |
---|
39 | # So first, find out what CEGUI version we have. |
---|
40 | |
---|
41 | IF (WIN32) |
---|
42 | ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua) |
---|
43 | INCLUDE_DIRECTORIES(ceguilua-0.6.1) |
---|
44 | ELSE (WIN32) |
---|
45 | # FIXME |
---|
46 | #IF (${CEGUI_VERSION} LESS 0.6.0) |
---|
47 | ADD_SUBDIRECTORY(ceguilua-0.5.0/ceguilua) |
---|
48 | INCLUDE_DIRECTORIES(ceguilua-0.5.0) |
---|
49 | #ELSE (${CEGUI_VERSION} LESS 0.6.0) |
---|
50 | # ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua) |
---|
51 | # INCLUDE_DIRECTORIES(ceguilua-0.6.1) |
---|
52 | #ENDIF (${CEGUI_VERSION} LESS 0.6.0) |
---|
53 | ENDIF (WIN32) |
---|
54 | |
---|
55 | # Our own libraries |
---|
56 | ADD_SUBDIRECTORY(util) |
---|
57 | ADD_SUBDIRECTORY(core) |
---|
58 | ADD_SUBDIRECTORY(audio) |
---|
59 | ADD_SUBDIRECTORY(network) |
---|
60 | ADD_SUBDIRECTORY(orxonox) |
---|
Note: See
TracBrowser
for help on using the repository browser.