From 7ebe3088bbbccd4919a56f95d33e43d3fedca50f Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 13 Dec 2015 13:06:23 +0100 Subject: [PATCH] Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set --HG-- branch : develop --- code/CMakeLists.txt | 3 +- code/nel/CMakeLists.txt | 14 ++----- code/nel/tools/3d/CMakeLists.txt | 8 ++-- code/nel/tools/CMakeLists.txt | 8 +++- code/nel/tools/misc/CMakeLists.txt | 38 +++++++++++-------- code/ryzom/CMakeLists.txt | 6 +-- code/ryzom/tools/CMakeLists.txt | 52 +++++++++++++------------- code/ryzom/tools/client/CMakeLists.txt | 4 +- code/ryzom/tools/server/CMakeLists.txt | 15 +++++--- 9 files changed, 79 insertions(+), 69 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 855084abb..f3325c947 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -104,6 +104,7 @@ IF(WIN32) ENDIF(WITH_MFC) ENDIF(WIN32) +FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(GIF) @@ -231,7 +232,7 @@ ENDIF(WITH_SNOWBALLS) IF(WITH_TOOLS) ADD_SUBDIRECTORY(tool) -ENDIF(WITH_TOOLS) +ENDIF() IF(WITH_STUDIO) ADD_SUBDIRECTORY(studio) diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index f283eaecb..b538feb4d 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -64,18 +64,12 @@ IF(WITH_INSTALL_LIBRARIES) ENDIF(UNIX) ADD_SUBDIRECTORY(include) -ENDIF(WITH_INSTALL_LIBRARIES) +ENDIF() ADD_SUBDIRECTORY(src) IF(WITH_NEL_SAMPLES) ADD_SUBDIRECTORY(samples) -ENDIF(WITH_NEL_SAMPLES) - -# Allow to compile only max plugins without other tools. -IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN) - IF(WITH_NEL_TOOLS) - FIND_PACKAGE(Squish) - ENDIF(WITH_NEL_TOOLS) - ADD_SUBDIRECTORY(tools) -ENDIF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN) +ENDIF() + +ADD_SUBDIRECTORY(tools) diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt index 37773e9ee..55481097b 100644 --- a/code/nel/tools/3d/CMakeLists.txt +++ b/code/nel/tools/3d/CMakeLists.txt @@ -66,15 +66,17 @@ IF(WITH_NEL_TOOLS AND WITH_3D) ADD_SUBDIRECTORY(object_viewer_widget) ENDIF(WITH_QT) + IF(WITH_NEL_TOOLS) + FIND_PACKAGE(Squish) + ENDIF() + IF(SQUISH_FOUND) ADD_SUBDIRECTORY(s3tc_compressor_lib) ADD_SUBDIRECTORY(panoply_maker) ADD_SUBDIRECTORY(tga_2_dds) ADD_SUBDIRECTORY(hls_bank_maker) - ENDIF(SQUISH_FOUND) + ENDIF() #crash_log_analyser - #shapes_exporter - ENDIF() diff --git a/code/nel/tools/CMakeLists.txt b/code/nel/tools/CMakeLists.txt index 0e1c5709d..cb3e2b577 100644 --- a/code/nel/tools/CMakeLists.txt +++ b/code/nel/tools/CMakeLists.txt @@ -1,11 +1,15 @@ # Don't add other subdirectories if only max plugins are selected. +ADD_SUBDIRECTORY(misc) + IF(WITH_NEL_TOOLS) - ADD_SUBDIRECTORY(misc) ADD_SUBDIRECTORY(memory) ENDIF(WITH_NEL_TOOLS) # Max plugins are under the 3d directory as well. -ADD_SUBDIRECTORY(3d) +# Allow to compile only max plugins without other tools. +IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN) + ADD_SUBDIRECTORY(3d) +ENDIF() # Don't add other subdirectories if only max plugins are selected. IF(WITH_NEL_TOOLS) diff --git a/code/nel/tools/misc/CMakeLists.txt b/code/nel/tools/misc/CMakeLists.txt index 22328af82..8f962d1f2 100644 --- a/code/nel/tools/misc/CMakeLists.txt +++ b/code/nel/tools/misc/CMakeLists.txt @@ -1,23 +1,29 @@ -SUBDIRS(bnp_make disp_sheet_id extract_filename lock make_sheet_id xml_packer) - +# always compile crash report IF(WITH_QT OR WITH_QT5) - ADD_SUBDIRECTORY(words_dic_qt) - ADD_SUBDIRECTORY(message_box_qt) ADD_SUBDIRECTORY(crash_report) ENDIF() -IF(WIN32) - ADD_SUBDIRECTORY(exec_timeout) - ADD_SUBDIRECTORY(message_box) - ADD_SUBDIRECTORY(multi_cd_setup_fix) +IF(WITH_NEL_TOOLS) + SUBDIRS(bnp_make disp_sheet_id extract_filename lock make_sheet_id xml_packer) - IF(MFC_FOUND) - ADD_SUBDIRECTORY(branch_patcher) - ADD_SUBDIRECTORY(data_mirror) - ADD_SUBDIRECTORY(log_analyser) - ADD_SUBDIRECTORY(log_analyser_plug_ins) - ADD_SUBDIRECTORY(words_dic) + IF(WITH_QT OR WITH_QT5) + ADD_SUBDIRECTORY(words_dic_qt) + ADD_SUBDIRECTORY(message_box_qt) ENDIF() -ENDIF() -ADD_SUBDIRECTORY(probe_timers) + IF(WIN32) + ADD_SUBDIRECTORY(exec_timeout) + ADD_SUBDIRECTORY(message_box) + ADD_SUBDIRECTORY(multi_cd_setup_fix) + + IF(MFC_FOUND) + ADD_SUBDIRECTORY(branch_patcher) + ADD_SUBDIRECTORY(data_mirror) + ADD_SUBDIRECTORY(log_analyser) + ADD_SUBDIRECTORY(log_analyser_plug_ins) + ADD_SUBDIRECTORY(words_dic) + ENDIF() + ENDIF() + + ADD_SUBDIRECTORY(probe_timers) +ENDIF() diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index eda0375d2..20590cc81 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -1,8 +1,6 @@ #----------------------------------------------------------------------------- #Platform specifics -FIND_PACKAGE(ZLIB) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common ) SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src) @@ -20,9 +18,7 @@ ELSEIF(WITH_RYZOM_TOOLS) ADD_SUBDIRECTORY(client) ENDIF(WITH_RYZOM_CLIENT) -IF(WITH_RYZOM_TOOLS) - ADD_SUBDIRECTORY(tools) -ENDIF(WITH_RYZOM_TOOLS) +ADD_SUBDIRECTORY(tools) IF(WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS) # Need servershare for build packed collision tool diff --git a/code/ryzom/tools/CMakeLists.txt b/code/ryzom/tools/CMakeLists.txt index 041ba210e..2c4118e24 100644 --- a/code/ryzom/tools/CMakeLists.txt +++ b/code/ryzom/tools/CMakeLists.txt @@ -1,30 +1,32 @@ -ADD_SUBDIRECTORY(skill_extractor) -ADD_SUBDIRECTORY(make_alias_file) -ADD_SUBDIRECTORY(make_anim_by_race) -ADD_SUBDIRECTORY(make_anim_melee_impact) -ADD_SUBDIRECTORY(pd_parser) -ADD_SUBDIRECTORY(assoc_mem) -ADD_SUBDIRECTORY(leveldesign) - -IF(WITH_LIGO) - ADD_SUBDIRECTORY(translation_tools) -ENDIF(WITH_LIGO) - -IF(WITH_NET) - ADD_SUBDIRECTORY(stats_scan) - ADD_SUBDIRECTORY(pdr_util) - ADD_SUBDIRECTORY(patch_gen) - IF(WIN32) - ADD_SUBDIRECTORY(sheets_packer_shard) - ENDIF(WIN32) -ENDIF(WITH_NET) - -IF(WITH_LIGO AND WITH_NET) - ADD_SUBDIRECTORY(sheets_packer) -ENDIF(WITH_LIGO AND WITH_NET) +IF(WITH_RYZOM_TOOLS) + ADD_SUBDIRECTORY(skill_extractor) + ADD_SUBDIRECTORY(make_alias_file) + ADD_SUBDIRECTORY(make_anim_by_race) + ADD_SUBDIRECTORY(make_anim_melee_impact) + ADD_SUBDIRECTORY(pd_parser) + ADD_SUBDIRECTORY(assoc_mem) + ADD_SUBDIRECTORY(leveldesign) + + IF(WITH_LIGO) + ADD_SUBDIRECTORY(translation_tools) + ENDIF() + + IF(WITH_NET) + ADD_SUBDIRECTORY(stats_scan) + ADD_SUBDIRECTORY(pdr_util) + ADD_SUBDIRECTORY(patch_gen) + + IF(WIN32) + ADD_SUBDIRECTORY(sheets_packer_shard) + ENDIF() + ENDIF() + + IF(WITH_LIGO AND WITH_NET) + ADD_SUBDIRECTORY(sheets_packer) + ENDIF() +ENDIF() ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(server) # Old stuff that doesn't compile anymore. diff --git a/code/ryzom/tools/client/CMakeLists.txt b/code/ryzom/tools/client/CMakeLists.txt index c76d21a9b..3cdaf0136 100644 --- a/code/ryzom/tools/client/CMakeLists.txt +++ b/code/ryzom/tools/client/CMakeLists.txt @@ -6,4 +6,6 @@ IF(WITH_RYZOM_CLIENT) ENDIF() ENDIF() -ADD_SUBDIRECTORY(r2_islands_textures) +IF(WITH_RYZOM_TOOLS) + ADD_SUBDIRECTORY(r2_islands_textures) +ENDIF() diff --git a/code/ryzom/tools/server/CMakeLists.txt b/code/ryzom/tools/server/CMakeLists.txt index 1f215ae94..1e8a6edb9 100644 --- a/code/ryzom/tools/server/CMakeLists.txt +++ b/code/ryzom/tools/server/CMakeLists.txt @@ -1,9 +1,12 @@ -IF(WITH_LIGO) - ADD_SUBDIRECTORY(ai_build_wmap) -ENDIF(WITH_LIGO) -IF(WITH_3D) - ADD_SUBDIRECTORY(build_world_packed_col) -ENDIF(WITH_3D) +IF(WITH_RYZOM_TOOLS) + IF(WITH_LIGO) + ADD_SUBDIRECTORY(ai_build_wmap) + ENDIF() + + IF(WITH_3D) + ADD_SUBDIRECTORY(build_world_packed_col) + ENDIF() +ENDIF() # Not done yet. #admin