diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b16d1b87..676dc60ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,18 +144,19 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/lib") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_PROFILE "${CMAKE_BINARY_DIR}/bin") -set(CMARK_DIR ${CMAKE_SOURCE_DIR}/third_party/cmark) -set(CURL_DIR ${CMAKE_SOURCE_DIR}/third_party/curl) -set(GIFLIB_DIR ${CMAKE_SOURCE_DIR}/third_party/giflib) -set(LIBJPEG_DIR ${CMAKE_SOURCE_DIR}/third_party/jpeg) -set(LIBPNG_DIR ${CMAKE_SOURCE_DIR}/third_party/libpng) -set(LIBWEBP_DIR ${CMAKE_SOURCE_DIR}/third_party/libwebp) -set(PIXMAN_DIR ${CMAKE_SOURCE_DIR}/third_party/pixman) -set(FREETYPE_DIR ${CMAKE_SOURCE_DIR}/third_party/freetype2) -set(HARFBUZZ_DIR ${CMAKE_SOURCE_DIR}/third_party/harfbuzz) -set(SIMPLEINI_DIR ${CMAKE_SOURCE_DIR}/third_party/simpleini) -set(TINYXML_DIR ${CMAKE_SOURCE_DIR}/third_party/tinyxml) -set(ZLIB_DIR ${CMAKE_SOURCE_DIR}/third_party/zlib) +set(SOURCE_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data) +set(CMARK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cmark) +set(CURL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/curl) +set(GIFLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/giflib) +set(LIBJPEG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jpeg) +set(LIBPNG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libpng) +set(LIBWEBP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libwebp) +set(PIXMAN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/pixman) +set(FREETYPE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/freetype2) +set(HARFBUZZ_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/harfbuzz) +set(SIMPLEINI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/simpleini) +set(TINYXML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/tinyxml) +set(ZLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib) # Search in the "cmake" directory for additional CMake modules. list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1963c86fc..1a19131d1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -127,31 +127,31 @@ add_subdirectory(app) # Copy data/ directory target file(GLOB_RECURSE src_data_files - RELATIVE ${CMAKE_SOURCE_DIR}/data/ "${CMAKE_SOURCE_DIR}/data/*.*") + RELATIVE ${SOURCE_DATA_DIR}/ "${SOURCE_DATA_DIR}/*.*") foreach(fn ${src_data_files}) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/bin/data/${fn} - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/data/${fn} ${CMAKE_BINARY_DIR}/bin/data/${fn} - MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/data/${fn}) + COMMAND ${CMAKE_COMMAND} -E copy ${SOURCE_DATA_DIR}/${fn} ${CMAKE_BINARY_DIR}/bin/data/${fn} + MAIN_DEPENDENCY ${SOURCE_DATA_DIR}/${fn}) list(APPEND out_data_files ${CMAKE_BINARY_DIR}/bin/data/${fn}) endforeach() add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/bin/data/README.md - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/README.md ${CMAKE_BINARY_DIR}/bin/data/README.md - MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/README.md) + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../README.md ${CMAKE_BINARY_DIR}/bin/data/README.md + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/../README.md) list(APPEND out_data_files ${CMAKE_BINARY_DIR}/bin/data/README.md) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/bin/data/EULA.txt - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/EULA.txt ${CMAKE_BINARY_DIR}/bin/data/EULA.txt - MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/EULA.txt) + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../EULA.txt ${CMAKE_BINARY_DIR}/bin/data/EULA.txt + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/../EULA.txt) list(APPEND out_data_files ${CMAKE_BINARY_DIR}/bin/data/EULA.txt) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/bin/data/docs/LICENSES.md - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/docs/LICENSES.md ${CMAKE_BINARY_DIR}/bin/data/docs/LICENSES.md - MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/docs/LICENSES.md) + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../docs/LICENSES.md ${CMAKE_BINARY_DIR}/bin/data/docs/LICENSES.md + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/../docs/LICENSES.md) list(APPEND out_data_files ${CMAKE_BINARY_DIR}/bin/data/docs/LICENSES.md) add_custom_target(copy_data DEPENDS ${out_data_files}) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 97593a462..12e92a167 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright (C) 2001-2018 David Capello # Generate a ui::Widget for each widget in a XML file -file(GLOB widget_files ${CMAKE_SOURCE_DIR}/data/widgets/*.xml) +file(GLOB widget_files ${SOURCE_DATA_DIR}/widgets/*.xml) foreach(widget_file ${widget_files}) get_filename_component(widget_name ${widget_file} NAME_WE) set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/${widget_name}.xml.h) @@ -19,7 +19,7 @@ foreach(widget_file ${widget_files}) endforeach() # Generate preference types from data/pref.xml -set(pref_xml ${CMAKE_SOURCE_DIR}/data/pref.xml) +set(pref_xml ${SOURCE_DATA_DIR}/pref.xml) set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/pref.xml.h) add_custom_command( @@ -42,7 +42,7 @@ add_custom_command( list(APPEND generated_files ${output_fn}) # Generate theme.xml.h from data/extensions/aseprite-theme/theme.xml -set(theme_xml ${CMAKE_SOURCE_DIR}/data/extensions/aseprite-theme/theme.xml) +set(theme_xml ${SOURCE_DATA_DIR}/extensions/aseprite-theme/theme.xml) set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/theme.xml.h) add_custom_command( OUTPUT ${output_fn} @@ -54,7 +54,7 @@ add_custom_command( list(APPEND generated_files ${output_fn}) # Generate strings.ini.h from data/strings/en.ini -set(strings_en_ini ${CMAKE_SOURCE_DIR}/data/strings/en.ini) +set(strings_en_ini ${SOURCE_DATA_DIR}/strings/en.ini) set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/strings.ini.h) add_custom_command( OUTPUT ${output_fn} @@ -77,13 +77,13 @@ add_custom_command( list(APPEND generated_files ${output_fn}) # Check translations -file(GLOB string_files ${CMAKE_SOURCE_DIR}/data/strings/*.ini) +file(GLOB string_files ${SOURCE_DATA_DIR}/strings/*.ini) set(output_fn ${CMAKE_CURRENT_BINARY_DIR}/check-translations.txt) add_custom_command( OUTPUT ${output_fn} - COMMAND ${GEN_EXE} --widgets-dir "${CMAKE_SOURCE_DIR}/data/widgets/" --strings-dir "${CMAKE_SOURCE_DIR}/data/strings/" --gui-file "${CMAKE_SOURCE_DIR}/data/gui.xml" >${output_fn} + COMMAND ${GEN_EXE} --widgets-dir "${SOURCE_DATA_DIR}/widgets/" --strings-dir "${SOURCE_DATA_DIR}/strings/" --gui-file "${SOURCE_DATA_DIR}/gui.xml" >${output_fn} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${GEN_DEP} ${widget_files} ${string_files} "${CMAKE_SOURCE_DIR}/data/gui.xml") + DEPENDS ${GEN_DEP} ${widget_files} ${string_files} "${SOURCE_DATA_DIR}/gui.xml") list(APPEND generated_files ${output_fn}) # Directory where generated files by "gen" utility will stay.