Mercurial > projects > qtd
diff generator/CMakeLists.txt @ 264:da7c867ef2ef
1) A bug is fixed when the generator doesn't restart if typesystem_${package}-java.java has been changed.
2) Refactoring.
| author | SokoL_SD |
|---|---|
| date | Mon, 07 Sep 2009 11:37:16 +0000 |
| parents | 4716eaf4a67e |
| children | 6cd923119ab1 |
line wrap: on
line diff
--- a/generator/CMakeLists.txt Mon Aug 31 12:07:28 2009 +0000 +++ b/generator/CMakeLists.txt Mon Sep 07 11:37:16 2009 +0000 @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) FIND_PACKAGE(Qt4 REQUIRED) -## Force Release settings +## Hack for msvc: force Release settings STRING(TOUPPER "${CMAKE_BUILD_TYPE}" build_type_upper) set(CMAKE_CXX_FLAGS_${build_type_upper} ${CMAKE_CXX_FLAGS_RELEASE}) get_property(dir_prop DIRECTORY @@ -195,8 +195,8 @@ add_executable(generator ${all_srcs} ) target_link_libraries(generator ${libs}) -## TODO: Precompilated header work well, but I don`t known license of PCHSupport_26.cmake. -## downloaded from http://www.vtk.org/Bug/view.php?id=1260. +## TODO: Precompilated header works well, but I don't know a license of PCHSupport_26.cmake which +## was downloaded from http://www.vtk.org/Bug/view.php?id=1260. #OPTION(USEPCH "Build the project with precompiled-headers" ON) #include(../cmake/PCHSupport_26.cmake) # @@ -223,9 +223,9 @@ set(gen_sources ${gen_sources} ${CMAKE_SOURCE_DIR}/generator/typesystem_${package}.xml) find_file(d_inc_file_found typesystem_${package}-java.java PATHS ${CMAKE_SOURCE_DIR}/generator/) if(d_inc_file_found) - set(${CMAKE_SOURCE_DIR}/generator/typesystem_${package}-java.java) + set(gen_sources ${gen_sources} ${CMAKE_SOURCE_DIR}/generator/typesystem_${package}-java.java) endif(d_inc_file_found) -endforeach(package ${all_packages}) +endforeach(package ${packages}) mark_as_advanced(d_inc_file_found) set(d_inc_file_found 1) @@ -252,6 +252,6 @@ qtjambi_masterinclude.h ${CMAKE_BINARY_DIR}/CMakeFiles/build.txt COMMENT "Generating binding..." - DEPENDS ${gen_sources} ${CMAKE_BINARY_DIR}/CMakeFiles/build.txt + DEPENDS generator ${gen_sources} ${CMAKE_BINARY_DIR}/CMakeFiles/build.txt ) add_custom_target(dgen ALL DEPENDS ${dgen_impl} COMMENT "")