Try to fix some build issues on obs

ColinDuquesnoy · Jan 14, 2018 · d969abc · d969abc
1 parent 5faba06
commit d969abc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,6 +32,7 @@ set_option(STATIC_LIBSTDCPP OFF BOOL "True to link statically with libstdc++ and
 set_option(UPDATE_TRANSLATIONS OFF BOOL "True to update translations")
 set_option(DEFAULT_THEME "Adaptive" STRING "The default theme (available: Default, Midna, MidnaDark, Breeze, BreezeDark, Deezer, Spotify,...)")
 set_option(USE_PRECOMPILED_HEADER ON BOOL "(GNU/Linux Only) ON to enable usage of pre-compiled headers. Default is ON")
+set_option(CHECK_QML_SYNTAX OFF BOOL "Whether to check for QML/Javascript syntax errors. Default is ON")
 if (UNIX)
     set_option(USE_LD_GOLD ON BOOL "Use GNU gold linker")
 endif()

diff --git a/scripts/travis/commit-build.sh b/scripts/travis/commit-build.sh
@@ -12,7 +12,7 @@ pushd build;
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     # build
-    cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=/usr ..;
+    cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCHECK_QML_SYNTAX=ON ..;
     make -j2;
 
     # run tests
@@ -21,7 +21,7 @@ fi
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     # build
-    cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON ..;
+    cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DCHECK_QML_SYNTAX=ON ..;
     make -j2;
 
     # run tests

diff --git a/scripts/travis/full-build.sh b/scripts/travis/full-build.sh
@@ -13,7 +13,7 @@ pushd build;
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     # build
-    cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=/usr ..;
+    cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCHECK_QML_SYNTAX=ON ..;
     make -j2;
 
     # run all tests
@@ -28,7 +28,7 @@ fi
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     # build
-    cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON ..;
+    cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DCHECK_QML_SYNTAX=ON ..;
     make -j2;
 
     # run all tests

diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
@@ -5,15 +5,14 @@ file(GLOB_RECURSE OTHER_FILES  "*.qrc" ".cmake" "qmldir")
 
 # automatically update imports.qrc and MellowPlayer/qmldir
 add_custom_target(update_imports COMMAND ${CMAKE_COMMAND} -P UpdateImports.cmake
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${SOURCE_FILES})
 
 # automatically check for syntax errors in qml and js files
 find_program(QMLLINT qmllint)
-if (QMLLINT)
+if (CHECK_QML_SYNTAX AND QMLLINT)
     message(STATUS "Found qmllint: ${QMLLINT}")
     add_custom_target(check_qml_syntax COMMAND ${QMLLINT} ${SOURCE_FILES})
     add_dependencies(update_imports check_qml_syntax)
 endif()
-
 add_library(${LIB_NAME} ${SOURCE_FILES} ${OTHER_FILES})
-add_dependencies(${LIB_NAME} update_imports)
+target_link_libraries(${LIB_NAME} Qt5::Core)