Skip to content

Commit

Permalink
Remove verbose code to check if a subdir exists
Browse files Browse the repository at this point in the history
The cmake build-in messages are good enough for us. No need to implement
custom things here.
  • Loading branch information
keneanung committed Oct 17, 2019
1 parent b3c7c07 commit 955e7fc
Showing 1 changed file with 5 additions and 22 deletions.
27 changes: 5 additions & 22 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -218,17 +218,8 @@ if(APPLE)
endif()
endif()

if(EXISTS "${CMAKE_HOME_DIRECTORY}/3rdparty/edbee-lib/CMakeLists.txt")
add_subdirectory(3rdparty/edbee-lib/edbee-lib)
elseif()
message(FATAL_ERROR "Cannot locate edbee-lib editor widget submodule source code, build abandoned!")
endif()

if(EXISTS "${CMAKE_HOME_DIRECTORY}/3rdparty/qtkeychain/CMakeLists.txt")
add_subdirectory(3rdparty/qtkeychain)
elseif()
message(FATAL_ERROR "Cannot locate QtKeychain submodule source code, build abandoned!")
endif()
add_subdirectory(3rdparty/edbee-lib/edbee-lib)
add_subdirectory(3rdparty/qtkeychain)

file(GLOB_RECURSE lua_files RELATIVE "${CMAKE_HOME_DIRECTORY}/src/mudlet-lua/lua/" "${CMAKE_HOME_DIRECTORY}/src/mudlet-lua/lua/*.lua")
list(LENGTH lua_files lua_file_count)
Expand Down Expand Up @@ -269,26 +260,18 @@ elseif()
endif()

if(USE_UPDATER)
if(EXISTS "${CMAKE_HOME_DIRECTORY}/3rdparty/dblsqd/CMakeLists.txt")
add_subdirectory(3rdparty/dblsqd)
else()
message(FATAL_ERROR "Cannot locate DBLSQD updater submodule source code, build abandoned!")
endif()
add_subdirectory(3rdparty/dblsqd)

if(APPLE)
if(EXISTS "${CMAKE_HOME_DIRECTORY}/3rdparty/sparkle-glue/CMakeLists.txt")
add_subdirectory(3rdparty/sparkle-glue)
else()
message(FATAL_ERROR "Cannot locate Sparkle glue for updater submodule source code, build abandoned!")
endif()

add_subdirectory(3rdparty/sparkle-glue)
if(NOT EXISTS "${CMAKE_HOME_DIRECTORY}/3rdparty/cocoapods/Pods/Sparkle")
message(STATUS "Sparkle CocoaPod is missing, running 'pod install' to get it...")
execute_process(TIMEOUT 30
WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/3rdparty/cocoapods"
COMMAND pod install)
endif()
endif()

endif()

find_program(CCACHE_FOUND ccache)
Expand Down

0 comments on commit 955e7fc

Please sign in to comment.