Git commit f7653ac80f3d3c57624117231d3cd71350748e53 by Arno Rehn, on behalf= of Dimitar Dobrev. Committed on 25/12/2012 at 01:47. Pushed by arnorehn into branch 'master'. Passed the build dir as a parameter to smokegen to use when searching for r= epeating functions and types. Signed-off-by: Dimitar Dobrev M +1 -1 akonadi/CMakeLists.txt M +1 -1 attica/CMakeLists.txt M +1 -1 kate/CMakeLists.txt M +1 -1 kdecore/CMakeLists.txt M +1 -1 kdeui/CMakeLists.txt M +1 -1 kfile/CMakeLists.txt M +1 -1 khtml/CMakeLists.txt M +1 -1 kio/CMakeLists.txt M +1 -1 knewstuff2/CMakeLists.txt M +1 -1 knewstuff3/CMakeLists.txt M +1 -1 kparts/CMakeLists.txt M +1 -1 ktexteditor/CMakeLists.txt M +1 -1 kutils/CMakeLists.txt M +1 -1 nepomuk/CMakeLists.txt M +1 -1 nepomukquery/CMakeLists.txt M +1 -1 okular/CMakeLists.txt M +1 -1 plasma/CMakeLists.txt M +1 -1 solid/CMakeLists.txt M +1 -1 soprano/CMakeLists.txt M +1 -1 sopranoclient/CMakeLists.txt M +1 -1 sopranoserver/CMakeLists.txt http://commits.kde.org/smokekde/f7653ac80f3d3c57624117231d3cd71350748e53 diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt index 4e55709..c85c476 100644 --- a/akonadi/CMakeLists.txt +++ b/akonadi/CMakeLists.txt @@ -19,7 +19,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -I "${AKONADI_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/akonad= i_includes.h + -I "${AKONADI_INCLUDE_DIR}" -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAK= E_CURRENT_SOURCE_DIR}/akonadi_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/attica/CMakeLists.txt b/attica/CMakeLists.txt index c2dda51..c6a53b1 100644 --- a/attica/CMakeLists.txt +++ b/attica/CMakeLists.txt @@ -13,7 +13,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kdecore/config.xml" -smok= econfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/attica_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/attica= _includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/kate/CMakeLists.txt b/kate/CMakeLists.txt index 2c42558..d134c56 100644 --- a/kate/CMakeLists.txt +++ b/kate/CMakeLists.txt @@ -16,7 +16,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -I ${KATE_INCLUDE_DIR} -config "${CMAKE_CURRENT_BINARY_DIR}/../kd= eui/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/kate_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/kate_i= ncludes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index 18a96db..5d5b93a 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -29,7 +29,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/kdecore_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/kdecor= e_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index 684661b..af96fdc 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -28,7 +28,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/kdeui_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/kdeui_= includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt index 452aa29..f56df1b 100644 --- a/kfile/CMakeLists.txt +++ b/kfile/CMakeLists.txt @@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smoke= data.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/kfile_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/kfile_= includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt index 2ad2466..b5fee3f 100644 --- a/khtml/CMakeLists.txt +++ b/khtml/CMakeLists.txt @@ -27,7 +27,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/khtml_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/khtml_= includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index b268490..b71a59e 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -28,7 +28,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/kio_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/kio_in= cludes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/knewstuff2/CMakeLists.txt b/knewstuff2/CMakeLists.txt index 3f3ed59..588e03b 100644 --- a/knewstuff2/CMakeLists.txt +++ b/knewstuff2/CMakeLists.txt @@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smoke= data.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/knewstuff2_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/knewst= uff2_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/knewstuff3/CMakeLists.txt b/knewstuff3/CMakeLists.txt index a8b0cd4..0b0692a 100644 --- a/knewstuff3/CMakeLists.txt +++ b/knewstuff3/CMakeLists.txt @@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smoke= data.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/knewstuff3_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/knewst= uff3_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt index e7a79a3..ae3bd76 100644 --- a/kparts/CMakeLists.txt +++ b/kparts/CMakeLists.txt @@ -28,7 +28,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/kparts_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/kparts= _includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/ktexteditor/CMakeLists.txt b/ktexteditor/CMakeLists.txt index 62ec591..725134e 100644 --- a/ktexteditor/CMakeLists.txt +++ b/ktexteditor/CMakeLists.txt @@ -17,7 +17,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/ktexteditor_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/ktexte= ditor_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt index 3d61109..032ac32 100644 --- a/kutils/CMakeLists.txt +++ b/kutils/CMakeLists.txt @@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smoke= data.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/kutils_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/kutils= _includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/nepomuk/CMakeLists.txt b/nepomuk/CMakeLists.txt index ff2134a..c240d49 100644 --- a/nepomuk/CMakeLists.txt +++ b/nepomuk/CMakeLists.txt @@ -23,7 +23,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/nepomuk_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/nepomu= k_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/nepomukquery/CMakeLists.txt b/nepomukquery/CMakeLists.txt index 7decc1a..24e78eb 100644 --- a/nepomukquery/CMakeLists.txt +++ b/nepomukquery/CMakeLists.txt @@ -14,7 +14,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../nepomuk/config.xml" -smok= econfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/nepomukquery_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/nepomu= kquery_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt index b1e7a53..0851a11 100644 --- a/okular/CMakeLists.txt +++ b/okular/CMakeLists.txt @@ -17,7 +17,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/okular_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/okular= _includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index eadb63c..4c5581a 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -17,7 +17,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/plasma_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/plasma= _includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/solid/CMakeLists.txt b/solid/CMakeLists.txt index 0fcf8fb..5e3936b 100644 --- a/solid/CMakeLists.txt +++ b/solid/CMakeLists.txt @@ -25,7 +25,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_BINARY_DIR}/smokeconfig.xml" - -- ${CMAKE_CURRENT_SOURCE_DIR}/solid_includes.h + -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAKE_CURRENT_SOURCE_DIR}/solid_= includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/soprano/CMakeLists.txt b/soprano/CMakeLists.txt index ed7257b..8044fa8 100644 --- a/soprano/CMakeLists.txt +++ b/soprano/CMakeLists.txt @@ -18,7 +18,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${= CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -I "${SOPRANO_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/sopran= o_includes.h + -I "${SOPRANO_INCLUDE_DIR}" -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAK= E_CURRENT_SOURCE_DIR}/soprano_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/sopranoclient/CMakeLists.txt b/sopranoclient/CMakeLists.txt index 7a68bd1..a199984 100644 --- a/sopranoclient/CMakeLists.txt +++ b/sopranoclient/CMakeLists.txt @@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../soprano/config.xml" -smok= econfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -I "${SOPRANO_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/sopran= o_includes.h + -I "${SOPRANO_INCLUDE_DIR}" -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAK= E_CURRENT_SOURCE_DIR}/soprano_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp ) diff --git a/sopranoserver/CMakeLists.txt b/sopranoserver/CMakeLists.txt index fd5ef87..8733243 100644 --- a/sopranoserver/CMakeLists.txt +++ b/sopranoserver/CMakeLists.txt @@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smo= kedata.cpp = COMMAND ${SMOKE_GEN_BIN} ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../soprano/config.xml" -smok= econfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" - -I "${SOPRANO_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/sopran= o_includes.h + -I "${SOPRANO_INCLUDE_DIR}" -L "${LIBRARY_OUTPUT_PATH}" -- ${CMAK= E_CURRENT_SOURCE_DIR}/soprano_includes.h DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) = macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${C= MAKE_CURRENT_BINARY_DIR}/x_1.cpp )