summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Dywan <christian@twotoasts.de>2018-11-07 13:48:23 +0100
committerGitHub <noreply@github.com>2018-11-07 13:48:23 +0100
commit9e8ac69c5de1b49498f2ab78f5181723bc015638 (patch)
tree2dbeec008abb9fd18772f5a3a5ad5c2b21d33d57
parent9d58178edb0f9ecee73fc77ccd28abac0e0f0d40 (diff)
downloadmidori-git-9e8ac69c5de1b49498f2ab78f5181723bc015638.tar.gz
Double-check that extension folder contains Vala sources (#161)
Fixes: #157
-rw-r--r--extensions/CMakeLists.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
index 500ac6b6..ca09afe0 100644
--- a/extensions/CMakeLists.txt
+++ b/extensions/CMakeLists.txt
@@ -19,11 +19,9 @@ foreach(UNIT_SRC ${EXTENSIONS})
file(GLOB UNIT_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${UNIT_SRC}/*.vala")
elseif (${UNIT_SRC} MATCHES "(.vala)$")
string(REPLACE ".vala" "" UNIT ${UNIT_SRC})
- else ()
- message(STATUS "Skipping ${UNIT_SRC}")
- continue()
endif ()
+ if ("${UNIT_SRC}" MATCHES "(.vala)$")
include(ValaPrecompile)
vala_precompile(UNIT_SRC_C ${UNIT}
${UNIT_SRC}
@@ -41,6 +39,9 @@ foreach(UNIT_SRC ${EXTENSIONS})
set_target_properties(${UNIT} PROPERTIES
COMPILE_FLAGS "${VALA_CFLAGS}"
)
+ else ()
+ continue()
+ endif ()
target_link_libraries(${UNIT}
${DEPS_LIBRARIES}
${DEPS_GTK_LIBRARIES}