diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 8b221ceae..b9c3d87dd 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -274,15 +274,13 @@ set(cockatrice_RESOURCES cockatrice.qrc) if(UPDATE_TRANSLATIONS) # Cockatrice main sources - file(GLOB_RECURSE translate_cockatrice_SRCS - ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/*.h + file(GLOB_RECURSE translate_cockatrice_SRCS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp + ${CMAKE_SOURCE_DIR}/cockatrice/src/*.h ) # All libcockatrice_* libraries (recursively) - file(GLOB_RECURSE translate_lib_SRCS - ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.cpp - ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.h + file(GLOB_RECURSE translate_lib_SRCS ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.cpp + ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.h ) # Combine all sources for translation @@ -293,7 +291,6 @@ else() file(GLOB cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts") endif() - if(WIN32) set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc) endif(WIN32) diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 00d9945c3..a67632022 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -68,9 +68,7 @@ endif() # ------------------------ # Include directories # ------------------------ -include_directories( - ../cockatrice/src -) +include_directories(../cockatrice/src) # ------------------------ # Optional libraries