Browse Source

Install tools to the 'bin/tool' directory.
Related to commit 6b6447eb8ce6e4c67f40f568b9116eabedf9f6f4.

Yao Wei Tjong 姚伟忠 10 years ago
parent
commit
6923bd0736

+ 3 - 0
Source/Extras/CMakeLists.txt

@@ -29,6 +29,9 @@ include_directories (${URHO3D_INCLUDE_DIRS})
 
 # All tools must be natively built and output to bin/tool subdir to differentiate them from platform-specific binaries in the bin directory
 set_output_directories (${CMAKE_BINARY_DIR}/bin/tool RUNTIME PDB)
+if (DEST_RUNTIME_DIR STREQUAL bin)
+    set (DEST_RUNTIME_DIR bin/tool)
+endif ()
 
 # Urho3D extras
 add_subdirectory (OgreBatchConverter)

+ 3 - 0
Source/ThirdParty/LuaJIT/src/host/CMakeLists.txt

@@ -88,6 +88,9 @@ set (INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} ..)
 
 # All tools must be natively built and output to bin/tool subdir to differentiate them from platform-specific binaries in the bin directory
 set_output_directories (${CMAKE_BINARY_DIR}/bin/tool RUNTIME PDB)
+if (DEST_RUNTIME_DIR STREQUAL bin)
+    set (DEST_RUNTIME_DIR bin/tool)
+endif ()
 
 # Setup target
 setup_executable (NODEPS)

+ 3 - 0
Source/ThirdParty/LuaJIT/src/host/minilua/CMakeLists.txt

@@ -33,6 +33,9 @@ endif ()
 
 # All tools must be natively built and output to bin/tool subdir to differentiate them from platform-specific binaries in the bin directory
 set_output_directories (${CMAKE_BINARY_DIR}/bin/tool RUNTIME PDB)
+if (DEST_RUNTIME_DIR STREQUAL bin)
+    set (DEST_RUNTIME_DIR bin/tool)
+endif ()
 
 # Setup target
 setup_executable (NODEPS)

+ 3 - 0
Source/ThirdParty/toluapp/src/bin/CMakeLists.txt

@@ -67,6 +67,9 @@ set (INCLUDE_DIRS ../../include ../../../../ThirdParty/Lua${JIT}/src)
 
 # All tools must be natively built and output to bin/tool subdir to differentiate them from platform-specific binaries in the bin directory
 set_output_directories (${CMAKE_BINARY_DIR}/bin/tool RUNTIME PDB)
+if (DEST_RUNTIME_DIR STREQUAL bin)
+    set (DEST_RUNTIME_DIR bin/tool)
+endif ()
 
 # Setup target
 if (APPLE)

+ 3 - 0
Source/Tools/CMakeLists.txt

@@ -48,6 +48,9 @@ endif ()
 
 # All tools must be natively built and output to bin/tool subdir to differentiate them from platform-specific binaries in the bin directory
 set_output_directories (${CMAKE_BINARY_DIR}/bin/tool RUNTIME PDB)
+if (DEST_RUNTIME_DIR STREQUAL bin)
+    set (DEST_RUNTIME_DIR bin/tool)
+endif ()
 
 if (URHO3D_TOOLS)
     # Urho3D tools