X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=4963bd5c64b954d574cb9fc503188bdfaf77f953;hb=db3491e272f3754676673d52c89238e9cc43b7ad;hp=f019049e3f561e9f395ee23cfc481621fa443da2;hpb=39a9f3650233206061134772417bfada16cd07be;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index f019049..4963bd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,6 @@ if (ENABLE_GUI) set (REQUIRE_GUI REQUIRED) endif () find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit ${REQUIRE_GUI}) - find_package (QJSON ${REQUIRE_GUI}) endif () if (WIN32) @@ -83,6 +82,10 @@ else () if (X11_FOUND) include_directories (${X11_INCLUDE_DIR}) add_definitions (-DHAVE_X11) + else () + # Print a clear message when X11 is not found + include (FindPackageMessage) + find_package_message (X11 "Could not find X11" "") endif () endif () @@ -203,8 +206,6 @@ set (PNG_DEFINITIONS "") set (PNG_LIBRARIES png_bundled) add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL) -include_directories (${PNG_INCLUDE_DIR}) -add_definitions (${PNG_DEFINITIONS}) if (MSVC) add_subdirectory (thirdparty/getopt EXCLUDE_FROM_ALL) @@ -216,16 +217,12 @@ if (WIN32) add_subdirectory (thirdparty/less) endif () -# The Qt website provides binaries for Windows and MacOSX, and they are -# automatically found by cmake without any manual intervention. The situation -# for QJSON is substantially different: there are no binaries for QJSON -# available, and there is no standard installation directory that is detected -# by cmake. -# -# By bundling the QJSON source, we make it much more easier to build the GUI on -# Windows and MacOSX. But we only use the bundled sources when ENABLE_GUI is -# AUTO. -if (QT4_FOUND AND NOT QJSON_FOUND AND (ENABLE_GUI STREQUAL "AUTO")) +# Always use bundled QJSon. +# - The packaged versions QJson are very old, and do not support NaN/Infinity. +# - To make it easier to build the GUI on Windows and MacOSX, as there are no +# binaries at all. +if (QT4_FOUND) + add_definitions (-DQJSON_EXPORT=) add_subdirectory (thirdparty/qjson EXCLUDE_FROM_ALL) set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) set (QJSON_LIBRARY_DIRS) @@ -277,8 +274,8 @@ set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers) # so that binaries can find each other using just relative paths. # add_definitions( - -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}" -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" + -DAPITRACE_PROGRAMS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/bin" -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}" -DAPITRACE_WRAPPERS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}" ) @@ -320,15 +317,9 @@ add_library (common STATIC common/trace_writer_local.cpp common/trace_writer_model.cpp common/trace_loader.cpp - common/trace_resource.cpp - common/trace_tools_trace.cpp common/trace_profiler.cpp - common/image.cpp - common/image_bmp.cpp - common/image_pnm.cpp - common/image_png.cpp + common/trace_option.cpp common/${os} - common/workqueue.cpp ) set_target_properties (common PROPERTIES @@ -338,7 +329,9 @@ set_target_properties (common PROPERTIES ) if (ANDROID) - target_link_libraries (common log) + target_link_libraries (common + log + ) endif () @@ -346,7 +339,9 @@ endif () # Sub-directories add_subdirectory (dispatch) +add_subdirectory (helpers) add_subdirectory (wrappers) +add_subdirectory (image) add_subdirectory (retrace) @@ -354,7 +349,10 @@ add_subdirectory (retrace) # CLI if (ENABLE_CLI) - add_subdirectory(cli) + if (WIN32) + add_subdirectory (inject) + endif () + add_subdirectory (cli) endif () ##############################################################################