# HG changeset patch # User David Nadlinger # Date 1282954635 -7200 # Node ID 6bd75093d3bb9e71af68da54bdaf46a62e5c1251 # Parent 4d17d96480db3a4bdf1961555c8ee637908a5057 Allow specifying the location the resulting D modules are installed to. diff -r 4d17d96480db -r 6bd75093d3bb CMakeLists.txt --- a/CMakeLists.txt Fri Aug 27 15:06:38 2010 +0200 +++ b/CMakeLists.txt Sat Aug 28 02:17:15 2010 +0200 @@ -73,6 +73,8 @@ ) endif() +set(D_MODULE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/d" CACHE PATH "D module install path" ) + # Check D compiler version if(D_VERSION EQUAL "1") if (D_FRONTEND LESS "050") @@ -175,7 +177,7 @@ PROJECT(qtd CXX C) if(NOT ${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR}) - load_cache(${CMAKE_BINARY_DIR}/.. INCLUDE_INTERNALS all_packages QTD_VERSION_STR QTD_VERSION CPP_SHARED) + load_cache(${CMAKE_BINARY_DIR}/.. INCLUDE_INTERNALS all_packages QTD_VERSION_STR QTD_VERSION CPP_SHARED D_MODULE_INSTALL_DIR) endif() set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) FIND_PACKAGE(D REQUIRED) @@ -448,7 +450,7 @@ regex_safe_string(ver_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR}/d${D_VERSION}) set(regexp_str_tmp "(${ver_safe_tmp}/|${cbd_safe_tmp}/|${csd_safe_tmp}/|)(.+)") string(REGEX REPLACE ${regexp_str_tmp} "\\2" ins_path "${path}") - install(FILES ${d_source} DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}.di) + install(FILES ${d_source} DESTINATION ${D_MODULE_INSTALL_DIR}/${ins_path} COMPONENT qtd RENAME ${name}.di) endforeach() endif(NOT GENERATE_DI_FILES) @@ -597,7 +599,7 @@ ) endif(NOT "${file_name}" STREQUAL "QGlobal" AND GENERATE_DI_FILES) set(interfaces_list ${interfaces_list} ${interface_file_path}/${file_name}.di) - install(FILES ${interface_file} COMPONENT qtd DESTINATION include/d/${inc_path}) + install(FILES ${interface_file} COMPONENT qtd DESTINATION ${D_MODULE_INSTALL_DIR}/${inc_path}) endforeach() endif() endif()