mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cmake: fix Application/Executable confusion

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-12-16 09:48:20 -08:00
parent b8483a1e6c
commit 23265f31b5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -50,7 +50,7 @@ if (${_index} EQUAL -1)
inputted value was: ${SUBSURFACE_TARGET_EXECUTABLE} inputted value was: ${SUBSURFACE_TARGET_EXECUTABLE}
Example: -DSUBSURFACE_TARGET_EXECUTABLE=DesktopApplication") Example: -DSUBSURFACE_TARGET_EXECUTABLE=DesktopExecutable")
endif() endif()
add_definitions(-DSUBSURFACE_SOURCE="${CMAKE_SOURCE_DIR}") add_definitions(-DSUBSURFACE_SOURCE="${CMAKE_SOURCE_DIR}")
@ -119,9 +119,9 @@ include_directories(.
# Project Target specific configuration should go here, # Project Target specific configuration should go here,
# if the configuration is too big or would disrupt the normal code flux, # if the configuration is too big or would disrupt the normal code flux,
# move it somewhere else (another file) and include it. # 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) set(SUBSURFACE_TARGET subsurface)
elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
set(SUBSURFACE_TARGET subsurface-mobile) set(SUBSURFACE_TARGET subsurface-mobile)
list(APPEND QT_EXTRA_COMPONENTS QtQuick) list(APPEND QT_EXTRA_COMPONENTS QtQuick)
list(APPEND QT_EXTRA_LIBRARIES Qt5::QtQuick) list(APPEND QT_EXTRA_LIBRARIES Qt5::QtQuick)
@ -199,7 +199,7 @@ if(SMARTTRAK_IMPORT)
add_subdirectory(smtk-import) add_subdirectory(smtk-import)
endif() endif()
if (${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") if (${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
add_subdirectory(desktop-widgets) add_subdirectory(desktop-widgets)
endif() endif()
@ -209,7 +209,7 @@ if(FBSUPPORT)
endif() endif()
# create the executables # create the executables
if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileApplication") if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
set(SUBSURFACE_TARGET subsurface-mobile) set(SUBSURFACE_TARGET subsurface-mobile)
set(MOBILE_SRC set(MOBILE_SRC
qt-mobile/qmlmanager.cpp qt-mobile/qmlmanager.cpp
@ -232,7 +232,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileApplication")
subsurface_corelib subsurface_corelib
${SUBSURFACE_LINK_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES}
) )
elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopApplication") elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable")
set(SUBSURFACE_APP set(SUBSURFACE_APP
subsurface-desktop-main.cpp subsurface-desktop-main.cpp
subsurface-desktop-helper.cpp subsurface-desktop-helper.cpp