comparison CMakeLists.txt @ 252:37eed70de029

More things broken than fixed. Rolling back to 263
author maxter
date Sat, 22 Aug 2009 12:50:58 +0000
parents 7664de4a55e5
children 34a37904ff77
comparison
equal deleted inserted replaced
251:739d0ee5bd91 252:37eed70de029
13 to this source directory as the last argument. 13 to this source directory as the last argument.
14 This process created the file `CMakeCache.txt` and the directory `CMakeFiles'. 14 This process created the file `CMakeCache.txt` and the directory `CMakeFiles'.
15 Please delete them. 15 Please delete them.
16 16
17 Or you can restart cmake with `-DALLOW_IN_SOURCE_BUILDS=1`, but it is not 17 Or you can restart cmake with `-DALLOW_IN_SOURCE_BUILDS=1`, but it is not
18 recommended. 18 recomended.
19 ") 19 ")
20 endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT ALLOW_IN_SOURCE_BUILDS) 20 endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT ALLOW_IN_SOURCE_BUILDS)
21 21
22 FIND_PACKAGE(Qt4 REQUIRED) 22 FIND_PACKAGE(Qt4 REQUIRED)
23 set (QT_USE_QTMAIN false) 23 set (QT_USE_QTMAIN false)
387 foreach(d_source ${package}/ArrayOps2 ${d_generated_files}) 387 foreach(d_source ${package}/ArrayOps2 ${d_generated_files})
388 set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${d_source}.d) 388 set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${d_source}.d)
389 endforeach(d_source ${d_generated_files}) 389 endforeach(d_source ${d_generated_files})
390 set(classes ArrayOps ${classes}) 390 set(classes ArrayOps ${classes})
391 foreach(class ${classes}) 391 foreach(class ${classes})
392 set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d) 392 set(d_sources ${d_sources} ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d)
393 set(aux_name ${CMAKE_BINARY_DIR}/qt/${package}/${class}_aux.d )
394 if(EXISTS ${aux_name})
395 set(d_sources ${d_sources} ${aux_name})
396 endif(EXISTS ${aux_name})
397 set(cpp_sources ${cpp_sources} ${CMAKE_BINARY_DIR}/cpp/qt_${package}/${class}_shell.cpp) 393 set(cpp_sources ${cpp_sources} ${CMAKE_BINARY_DIR}/cpp/qt_${package}/${class}_shell.cpp)
398 endforeach(class ${classes}) 394 endforeach(class ${classes})
399 set(files_for_gen ${files_for_gen} ${cpp_sources} ${d_sources}) 395 set(files_for_gen ${files_for_gen} ${cpp_sources} ${d_sources})
400 396
401 foreach (cpp_source ${cpp_files}) 397 foreach (cpp_source ${cpp_files})
419 regex_safe_string(csd_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR}) 415 regex_safe_string(csd_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR})
420 regex_safe_string(ver_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR}/qt/d${D_VERSION}) 416 regex_safe_string(ver_safe_tmp ${CMAKE_CURRENT_SOURCE_DIR}/qt/d${D_VERSION})
421 set(regexp_str_tmp "(${ver_safe_tmp}/|${cbd_safe_tmp}/|${csd_safe_tmp}/|)(.+)") 417 set(regexp_str_tmp "(${ver_safe_tmp}/|${cbd_safe_tmp}/|${csd_safe_tmp}/|)(.+)")
422 string(REGEX REPLACE ${regexp_str_tmp} "\\2" ins_path "${path}") 418 string(REGEX REPLACE ${regexp_str_tmp} "\\2" ins_path "${path}")
423 install(FILES ${d_source} DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}.di) 419 install(FILES ${d_source} DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}.di)
424 install(FILES ${path}/${name}_aux.d DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}_aux.di OPTIONAL) 420 install(FILES ${path}/${name}_enum.d DESTINATION include/d/${ins_path} COMPONENT qtd RENAME ${name}_enum.di OPTIONAL)
425 endforeach(d_source ${d_sources}) 421 endforeach(d_source ${d_sources})
426 endif(NOT GENERATE_DI_FILES) 422 endif(NOT GENERATE_DI_FILES)
427 423
428 ## Link CPP library. 424 ## Link CPP library.
429 if(CPP_SHARED) 425 if(CPP_SHARED)