Browse Source

Fix cycling dependency between cpp files and automoc

Alexey Edelev 6 years ago
parent
commit
aee42767c7
2 changed files with 2 additions and 6 deletions
  1. 1 3
      examples/addressbook/CMakeLists.txt
  2. 1 3
      tests/CMakeLists.txt

+ 1 - 3
examples/addressbook/CMakeLists.txt

@@ -41,9 +41,7 @@ foreach(EXPECTED_GENERATED_HEADER ${EXPECTED_GENERATED_HEADERS})
 
     list(APPEND GENERATED_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.cpp)
     list(APPEND GENERATED_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.h)
-    if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
-       set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.cpp PROPERTY SKIP_AUTOMOC ON)
-    endif()
+    set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.cpp PROPERTY SKIP_AUTOMOC ON)
 endforeach(EXPECTED_GENERATED_HEADER)
 
 if(${CMAKE_VERSION} VERSION_LESS "3.10.0")

+ 1 - 3
tests/CMakeLists.txt

@@ -80,9 +80,7 @@ foreach(EXPECTED_GENERATED_HEADER ${EXPECTED_GENERATED_HEADERS})
 
     list(APPEND GENERATED_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.cpp)
     list(APPEND GENERATED_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.h)
-    if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
-       set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.cpp PROPERTY SKIP_AUTOMOC ON)
-    endif()
+    set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${GENERATED_HEADER_BASENAME}.cpp PROPERTY SKIP_AUTOMOC ON)
 endforeach(EXPECTED_GENERATED_HEADER)
 
 if(${CMAKE_VERSION} VERSION_LESS "3.10.0")