[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/pim/akonadi
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2009-07-14 13:54:21
Message-ID: 1247579661.801313.19270.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 996505 by skelly:

Fix the way the data dir is found.

 M  +3 -1      kjots_common/CMakeLists.txt  
 M  +1 -2      kjots_resource/CMakeLists.txt  


--- trunk/playground/pim/akonadi/kjots_common/CMakeLists.txt #996504:996505
@@ -8,7 +8,9 @@
 )
 
 # Temporary for development
-FILE(WRITE ${PROJECT_BINARY_DIR}/datadir.h "#define DATADIR \"" \
${PROJECT_SOURCE_DIR}/data/ "\"\n\n" ) +set(DATADIR "${PROJECT_SOURCE_DIR}/data/" )
+configure_file(datadir.h.cmake ${PROJECT_BINARY_DIR}/datadir.h)
+
 include_directories( ${PROJECT_BINARY_DIR} )
 
 kde4_add_library(kjots_common SHARED ${kjots_common_SRCS} )
--- trunk/playground/pim/akonadi/kjots_resource/CMakeLists.txt #996504:996505
@@ -12,8 +12,7 @@
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
 # Temporary for development
-FILE(WRITE ${PROJECT_BINARY_DIR}/datadir.h "#define DATADIR \"" \
                ${PROJECT_SOURCE_DIR}../kjots_common/data/ "\"\n\n" )
-include_directories( ${PROJECT_BINARY_DIR} )
+include_directories( ${PROJECT_BINARY_DIR}/../kjots_common )
 
 ########### next target ###############
 


[prev in list] [next in list] [prev in thread] [next in thread]