From 77a2c8bcf07352a75a580f1445ba112dbea69731 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 24 Jun 2013 18:38:26 -0700 Subject: Check for Qt4 earlier --- CMakeLists.txt | 10 +++++++--- utils/alsoft-config/CMakeLists.txt | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bd587b0..10d278d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -766,6 +766,9 @@ ENDIF() # This is always available SET(BACKENDS "${BACKENDS} Null") +IF(ALSOFT_UTILS) + add_subdirectory(utils/alsoft-config) +ENDIF() IF(ALSOFT_EXAMPLES) FIND_PACKAGE(SDL) IF(SDL_FOUND) @@ -864,10 +867,11 @@ IF(ALSOFT_UTILS) LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}" ) - MESSAGE(STATUS "Building utility programs") - - add_subdirectory(utils/alsoft-config) + MESSAGE(STATUS "Building utility programs") + IF(TARGET ../../alsoft-config) + MESSAGE(STATUS "Building configuration program") + ENDIF() MESSAGE(STATUS "") ENDIF() diff --git a/utils/alsoft-config/CMakeLists.txt b/utils/alsoft-config/CMakeLists.txt index 511628cb..1a5085a4 100644 --- a/utils/alsoft-config/CMakeLists.txt +++ b/utils/alsoft-config/CMakeLists.txt @@ -25,5 +25,4 @@ if(QT4_FOUND) LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}" ) - message(STATUS "Building configuration program") endif() -- cgit v1.2.3