Changeset 2610 for code/branches/buildsystem2/src/CMakeLists.txt

Timestamp:

Jan 29, 2009, 9:04:27 PM (15 years ago)

Author:

rgrieder

Message:

Prefixed library directory for each internal third party library.
From now on, include for instance <tolua/tolua++> instead of <tolua++.h>
This may avoid problems if external include directories because some of our includes our modified. Consider e.g. ENet to be in /usr/include/enet/enet.h. Then you will have /usr/inlcude as include directory, possibly revealing an installed version of, say, TinyXML++.

File:

• code/branches/buildsystem2/src/CMakeLists.txt (modified) (3 diffs)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -21 +21 @@
 
 INCLUDE_DIRECTORIES(
-  ceguilua/ceguilua-${CEGUI_VERSION}/ceguilua
-  cpptcl
-  ois
-  tinyxml
-  tolua
+  ceguilua/ceguilua-${CEGUI_VERSION}
 )
 
@@ -45 +41 @@
 
 # External libraries, but copied into the repository
+ADD_SUBDIRECTORY(tolua)
 ADD_SUBDIRECTORY(ceguilua)
 ADD_SUBDIRECTORY(cpptcl)
@@ -50 +47 @@
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
-ADD_SUBDIRECTORY(tolua)
 
 # Our own libraries