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

Find the telldus-core.h header in the output directory on Windows.

Browse source
This commit is contained in:
Micke Prag 2011-09-06 13:03:20 +00:00
parent da2308b29c
commit 5f0d1b3c72
4 changed files with 24 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
telldus-gui/CMakeLists.txt
View file

@ -24,12 +24,10 @@ SET(BUILD_TELLDUS-CENTER TRUE CACHE BOOL "Build TelldusCenter")
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
SET(GENERATE_MAN FALSE CACHE BOOL "Enable generation of man-files") SET(GENERATE_MAN FALSE CACHE BOOL "Enable generation of man-files")
IF (WIN32) IF(UNIX)
SET(TELLDUSCORE_INCLUDE_DIR "" CACHE PATH "Path to the directory which contains telldus-core.h")
ELSEIF(UNIX)
SET(PLUGIN_LIB_PATH "lib" CACHE STRING "Relative path to the directory to install TelldusCenter plugin libraries into") SET(PLUGIN_LIB_PATH "lib" CACHE STRING "Relative path to the directory to install TelldusCenter plugin libraries into")
SET(PLUGIN_LIB_FULL_PATH "${PLUGIN_LIB_PATH}/telldus/tellduscenter/plugins") SET(PLUGIN_LIB_FULL_PATH "${PLUGIN_LIB_PATH}/telldus/tellduscenter/plugins")
ENDIF (WIN32) ENDIF ()
if(BUILD_LIBTELLDUS-GUI) if(BUILD_LIBTELLDUS-GUI)
ADD_SUBDIRECTORY(TelldusGui) ADD_SUBDIRECTORY(TelldusGui)

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

@ -21,9 +21,5 @@ SET( Plugin_EXTRA
FIND_PACKAGE(TelldusCore REQUIRED) FIND_PACKAGE(TelldusCore REQUIRED)
SET( Plugin_LIBRARIES ${TELLDUSCORE_LIBRARY} ) SET( Plugin_LIBRARIES ${TELLDUSCORE_LIBRARY} )
INCLUDE_DIRECTORIES(
${TELLDUSCORE_INCLUDE_DIR}
)
INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE ) INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )

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

@ -71,7 +71,7 @@ SET( telldus-gui_LIBRARIES
) )
FIND_PACKAGE(TelldusCore REQUIRED) FIND_PACKAGE(TelldusCore REQUIRED)
list(APPEND telldus-gui_LIBRARIES ${TELLDUSCORE_LIBRARY} ) LIST(APPEND telldus-gui_LIBRARIES ${TELLDUSCORE_LIBRARY} )
######## Configurable options for the platform ######## ######## Configurable options for the platform ########
@ -96,9 +96,6 @@ ELSEIF (WIN32)
-D_WINDOWS -D_WINDOWS
-DTELLDUSGUI_EXPORTS -DTELLDUSGUI_EXPORTS
) )
INCLUDE_DIRECTORIES(
${TELLDUSCORE_INCLUDE_DIR}
)
ELSE (APPLE) ELSE (APPLE)
#### Linux #### #### Linux ####
SET( telldus-gui_TARGET telldus-gui ) SET( telldus-gui_TARGET telldus-gui )

42
telldus-gui/cmake/FindTelldusCore.cmake
View file

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