Browse Source

Create sub-projects for Samples/Tools/Extras.

Yao Wei Tjong 姚伟忠 12 years ago
parent
commit
a9ed330890

+ 1 - 1
Source/CMakeLists.txt

@@ -106,7 +106,7 @@ endif ()
 # Do not build extras for iOS and Android regardless of its build option 
 if (NOT IOS AND NOT ANDROID AND ENABLE_EXTRAS)   
     # Urho3D extras
-    add_subdirectory (Extras/OgreBatchConverter)
+    add_subdirectory (Extras)
 endif ()
 
 # Generate platform specific Doxyfile automatically

+ 31 - 0
Source/Extras/CMakeLists.txt

@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2008-2013 the Urho3D project.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+# Set project name
+project (Urho3D-Extras)
+
+# Find Urho3D library
+find_package (Urho3D REQUIRED)
+include_directories (${URHO3D_INCLUDE_DIR})
+
+# Urho3D script host application
+add_subdirectory (OgreBatchConverter)

+ 0 - 4
Source/Extras/OgreBatchConverter/CMakeLists.txt

@@ -20,10 +20,6 @@
 # THE SOFTWARE.
 #
 
-# Find Urho3D library
-find_package (Urho3D REQUIRED)
-include_directories (${URHO3D_INCLUDE_DIR})
-
 # Define target name
 set (TARGET_NAME OgreBatchConverter)
 

+ 3 - 0
Source/Samples/CMakeLists.txt

@@ -20,6 +20,9 @@
 # THE SOFTWARE.
 #
 
+# Set project name
+project (Urho3D-Samples)
+
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
 include_directories (${URHO3D_INCLUDE_DIR})

+ 3 - 0
Source/Tools/CMakeLists.txt

@@ -20,6 +20,9 @@
 # THE SOFTWARE.
 #
 
+# Set project name
+project (Urho3D-Tools)
+
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
 include_directories (${URHO3D_INCLUDE_DIR})