X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=549d0665c0c3110d22a16f873be39beb62201562;hb=c76fc373508945f419e56b3736f9fb2c8e088ad2;hp=7f75d07f9940b3cfa395633f94a9c6a6316e37f3;hpb=b35ae0df401ff22e3b2dc9b6bfacf1e23baebde0;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f75d07..549d066 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,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) @@ -270,18 +268,6 @@ endif () set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers) -# Expose the binary/install directories to source -# -# TODO: Use the same directory layout, for both build and install directories, -# 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_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}" - -DAPITRACE_WRAPPERS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}" -) - ############################################################################## # Common libraries / utilities @@ -319,13 +305,7 @@ 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} ) @@ -337,7 +317,9 @@ set_target_properties (common PROPERTIES ) if (ANDROID) - target_link_libraries (common log) + target_link_libraries (common + log + ) endif () @@ -345,7 +327,9 @@ endif () # Sub-directories add_subdirectory (dispatch) +add_subdirectory (helpers) add_subdirectory (wrappers) +add_subdirectory (image) add_subdirectory (retrace) @@ -353,7 +337,10 @@ add_subdirectory (retrace) # CLI if (ENABLE_CLI) - add_subdirectory(cli) + if (WIN32) + add_subdirectory (inject) + endif () + add_subdirectory (cli) endif () ##############################################################################