jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Added a better way to find TelldusCore

Browse source
This commit is contained in:
Micke Prag 2010-03-26 15:26:03 +00:00
parent 5bdc62fdee
commit 3aa67a39dd
5 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
telldus-gui/CMakeLists.txt
View file

@ -6,7 +6,7 @@ if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW) cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy) endif(COMMAND cmake_policy)
SET(PACKAGE_VERSION 2.0.900) SET(PACKAGE_VERSION 2.0.100)
SET(PACKAGE_SOVERSION 2) SET(PACKAGE_SOVERSION 2)
SET(DISPLAYED_VERSION ${PACKAGE_VERSION}) SET(DISPLAYED_VERSION ${PACKAGE_VERSION})
@ -16,6 +16,8 @@ SET(LANGUAGES sv)
SET(BUILD_LIBTELLDUS-GUI TRUE CACHE BOOL "Build libtelldus-gui") SET(BUILD_LIBTELLDUS-GUI TRUE CACHE BOOL "Build libtelldus-gui")
SET(BUILD_TELLDUS-CENTER TRUE CACHE BOOL "Build TelldusCenter") SET(BUILD_TELLDUS-CENTER TRUE CACHE BOOL "Build TelldusCenter")
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
IF (WIN32) IF (WIN32)
SET(TELLDUSCORE_INCLUDE_DIR "" CACHE PATH "Path to the directory which contains telldus-core.h") SET(TELLDUSCORE_INCLUDE_DIR "" CACHE PATH "Path to the directory which contains telldus-core.h")
ENDIF (WIN32) ENDIF (WIN32)

15
telldus-gui/Plugins/Devices/CMakeLists.txt
View file

@ -13,9 +13,18 @@ SET( Plugin_MOC_HDRS
SET( Plugin_PATH "com.telldus.gui" ) SET( Plugin_PATH "com.telldus.gui" )
SET( Plugin_LIBRARIES IF (WINDOWS)
${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusGui.lib SET( Plugin_LIBRARIES
) ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusGui.lib
)
ELSE (WINDOWS)
FIND_PACKAGE(TelldusCore REQUIRED)
FIND_LIBRARY( TELLDUSGUI_LIBRARY telldus-gui )
SET( Plugin_LIBRARIES
${TELLDUSGUI_LIBRARY}
)
ENDIF (WINDOWS)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${TELLDUSCORE_INCLUDE_DIR} ${TELLDUSCORE_INCLUDE_DIR}

8
telldus-gui/Plugins/TelldusCore/CMakeLists.txt
View file

@ -13,12 +13,8 @@ SET( Plugin_MOC_HDRS
tellduscoreobject.h tellduscoreobject.h
) )
SET( Plugin_LIBRARIES FIND_PACKAGE(TelldusCore REQUIRED)
${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusCore.lib SET( Plugin_LIBRARIES ${TELLDUSCORE_LIBRARY} )
)
INCLUDE_DIRECTORIES(
${TELLDUSCORE_INCLUDE_DIR}
)
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

13
telldus-gui/TelldusGui/CMakeLists.txt
View file

@ -16,7 +16,7 @@ SET( telldus-gui_SRCS
vendordevicemodel.cpp vendordevicemodel.cpp
vendordevicetreeitem.cpp vendordevicetreeitem.cpp
devicesettingarctechselflearning.cpp devicesettingarctechselflearning.cpp
devicesettingbrateck.cpp devicesettingbrateck.cpp
devicesettinggao.cpp devicesettinggao.cpp
devicesettingikea.cpp devicesettingikea.cpp
devicesettingnexa.cpp devicesettingnexa.cpp
@ -41,7 +41,7 @@ SET( telldus-gui_MOC_HDRS
editgroupdialog.h editgroupdialog.h
vendordevicemodel.h vendordevicemodel.h
devicesettingarctechselflearning.h devicesettingarctechselflearning.h
devicesettingbrateck.h devicesettingbrateck.h
devicesettinggao.h devicesettinggao.h
devicesettingikea.h devicesettingikea.h
devicesettingnexa.h devicesettingnexa.h
@ -58,12 +58,13 @@ QT4_WRAP_CPP( telldus-gui_MOC_SRCS ${telldus-gui_MOC_HDRS} )
QT4_AUTOMOC ( ${telldus-gui_SRCS} ) QT4_AUTOMOC ( ${telldus-gui_SRCS} )
QT4_ADD_RESOURCES (telldus-gui_RSRCS telldusgui.qrc ) QT4_ADD_RESOURCES (telldus-gui_RSRCS telldusgui.qrc )
SET( telldus-gui_LIBRARIES SET( telldus-gui_LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusCore.lib
) )
FIND_PACKAGE(TelldusCore REQUIRED)
list(APPEND telldus-gui_LIBRARIES ${TELLDUSCORE_LIBRARY} )
######## Configurable options for the platform ######## ######## Configurable options for the platform ########
@ -76,6 +77,10 @@ IF (APPLE)
ADD_DEFINITIONS( ADD_DEFINITIONS(
-D_MACOSX -D_MACOSX
) )
INCLUDE_DIRECTORIES(
/usr/local/include
)
ELSEIF (WIN32) ELSEIF (WIN32)
#### Windows #### #### Windows ####
SET( telldus-gui_TARGET TelldusGui ) SET( telldus-gui_TARGET TelldusGui )

19
telldus-gui/cmake/FindTelldusCore.cmake Normal file
View file

@ -0,0 +1,19 @@
IF (APPLE)
FIND_LIBRARY( TELLDUSCORE_LIBRARY TelldusCore )
INCLUDE_DIRECTORIES(
${TELLDUSCORE_LIBRARY}/Headers
)
ELSEIF (WINDOWS)
SET(TELLDUSCORE_LIBRARY ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/TelldusCore.lib)
ELSE (APPLE)
FIND_LIBRARY( TELLDUSCORE_LIBRARY telldus-core )
ENDIF(APPLE)