From 23265f31b5ef29835964b132a8925ab65bee1d42 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 16 Dec 2015 09:48:20 -0800 Subject: Cmake: fix Application/Executable confusion Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e745bc98c..a47904b08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ if (${_index} EQUAL -1) inputted value was: ${SUBSURFACE_TARGET_EXECUTABLE} - Example: -DSUBSURFACE_TARGET_EXECUTABLE=DesktopApplication") + Example: -DSUBSURFACE_TARGET_EXECUTABLE=DesktopExecutable") endif() add_definitions(-DSUBSURFACE_SOURCE="${CMAKE_SOURCE_DIR}") @@ -119,9 +119,9 @@ include_directories(. # Project Target specific configuration should go here, # if the configuration is too big or would disrupt the normal code flux, # move it somewhere else (another file) and include it. -if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") +if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") set(SUBSURFACE_TARGET subsurface) -elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") +elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") set(SUBSURFACE_TARGET subsurface-mobile) list(APPEND QT_EXTRA_COMPONENTS QtQuick) list(APPEND QT_EXTRA_LIBRARIES Qt5::QtQuick) @@ -199,7 +199,7 @@ if(SMARTTRAK_IMPORT) add_subdirectory(smtk-import) endif() -if (${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") +if (${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") add_subdirectory(desktop-widgets) endif() @@ -209,7 +209,7 @@ if(FBSUPPORT) endif() # create the executables -if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileApplication") +if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") set(SUBSURFACE_TARGET subsurface-mobile) set(MOBILE_SRC qt-mobile/qmlmanager.cpp @@ -232,7 +232,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileApplication") subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES} ) -elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") +elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") set(SUBSURFACE_APP subsurface-desktop-main.cpp subsurface-desktop-helper.cpp -- cgit v1.2.3-70-g09d2