From d93b5b9769cc8104cfdb4a083fe659702cd263f3 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Fri, 13 Feb 2015 23:17:10 -0800 Subject: [PATCH] Add a tools meta-target --- CMakeLists.txt | 5 +++++ Sources/Plasma/Apps/CMakeLists.txt | 18 ++++++++++++++---- Sources/Tools/CMakeLists.txt | 13 ++++++++++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 511bca95..f38d4798 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,6 +108,11 @@ option(PLASMA_BUILD_TOOLS "Do we want to build the Plasma tools?" ON) option(PLASMA_BUILD_TESTS "Do we want to build the unit tests?" OFF) option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF) +if(PLASMA_BUILD_TOOLS) + # Custom dummy target for compiling all tools + add_custom_target(tools) +endif() + if(3dsm_BUILD_PLUGIN) find_package(MaxSDK REQUIRED) add_definitions(-DBUILDING_MAXPLUGIN) diff --git a/Sources/Plasma/Apps/CMakeLists.txt b/Sources/Plasma/Apps/CMakeLists.txt index f3a1efa7..4559481f 100644 --- a/Sources/Plasma/Apps/CMakeLists.txt +++ b/Sources/Plasma/Apps/CMakeLists.txt @@ -1,8 +1,10 @@ -add_subdirectory(plClient) -add_subdirectory(plCrashHandler) +if(WIN32) + add_subdirectory(plClient) + add_subdirectory(plCrashHandler) -if(PLASMA_BUILD_LAUNCHER) - add_subdirectory(plUruLauncher) + if(PLASMA_BUILD_LAUNCHER) + add_subdirectory(plUruLauncher) + endif() endif() if(PLASMA_BUILD_TOOLS) @@ -11,4 +13,12 @@ if(PLASMA_BUILD_TOOLS) add_subdirectory(plFileEncrypt) add_subdirectory(plPageInfo) add_subdirectory(plPageOptimizer) + + add_dependencies(tools + plPythonPack + plFileSecure + plFileEncrypt + plPageInfo + plPageOptimizer + ) endif() diff --git a/Sources/Tools/CMakeLists.txt b/Sources/Tools/CMakeLists.txt index f7d07da9..ef7f2aa4 100644 --- a/Sources/Tools/CMakeLists.txt +++ b/Sources/Tools/CMakeLists.txt @@ -4,9 +4,20 @@ if(PLASMA_BUILD_TOOLS) add_subdirectory(plLocalizationEditor) add_subdirectory(plResBrowser) - add_subdirectory(plShaderAssembler) + + add_dependencies(tools + plLocalizationEditor + plResBrowser + ) + + if(WIN32) + add_subdirectory(plShaderAssembler) + add_dependencies(tools plShaderAssembler) + endif() + if(FREETYPE_FOUND) add_subdirectory(plFontConverter) + add_dependencies(tools plFontConverter) endif() endif()