ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1178 from knnniggett/submodulecheck 

Check for the presence of CrudControllerTrait.php instead of .git
This commit is contained in:
Isaac Connor 2015-12-04 13:09:03 -05:00
parent d9e8f74298 1957c5672f
commit 11a808556b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -9,10 +9,10 @@ set(zoneminder_VERSION "1.28.109")
set(zoneminder_API_VERSION "${zoneminder_VERSION}.1") set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
# Make sure the submodules are there # Make sure the submodules are there
if( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/.git" ) if( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )
message( SEND_ERROR "The git submodules are not available. Please run message( SEND_ERROR "The git submodules are not available. Please run
git submodule update --init --recursive") git submodule update --init --recursive")
endif( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/.git" ) endif( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )
# CMake does not allow out-of-source build if CMakeCache.exists # CMake does not allow out-of-source build if CMakeCache.exists
# in the source folder. Abort and notify the user # in the source folder. Abort and notify the user