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

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-03-21 21:28:17
Message-ID: 1142976497.334046.21776.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 521199 by mueller:

once again apply LIBRARY_PATH setting which AGAIN got reverted


 M  +8 -8      FindKDE4Internal.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #521198:521199
@@ -267,7 +267,7 @@
    else (WIN32)
       set(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl )
       set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib ) 
-#      set(KDE4_LD_LIBRARY_PATH \
LD_LIBRARY_PATH=${LIBRARY_OUTPUT_PATH}\$\${LD_LIBRARY_PATH+:\$\$LD_LIBRARY_PATH} ) +  \
set(KDE4_LD_LIBRARY_PATH \
LD_LIBRARY_PATH=${LIBRARY_OUTPUT_PATH}\$\${LD_LIBRARY_PATH+:\$\$LD_LIBRARY_PATH} )  \
endif (WIN32)  
    set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
@@ -275,13 +275,13 @@
   
    # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
    if (KDE4_NEED_WRAPPER_SCRIPTS)
-      set(KDE4_DCOPIDL2CPP_EXECUTABLE \
                ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp.sh )
-      set(KDE4_KCFGC_EXECUTABLE       \
                ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.sh )
-      set(KDE4_MEINPROC_EXECUTABLE    \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc.sh ) +      \
set(KDE4_DCOPIDL2CPP_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp.sh ) +      \
set(KDE4_KCFGC_EXECUTABLE       ${KDE4_LD_LIBRARY_PATH} \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.sh ) +      \
set(KDE4_MEINPROC_EXECUTABLE    ${KDE4_LD_LIBRARY_PATH} \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc.sh )  else \
                (KDE4_NEED_WRAPPER_SCRIPTS)
-      set(KDE4_DCOPIDL2CPP_EXECUTABLE \
                ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp )
-      set(KDE4_KCFGC_EXECUTABLE       \
                ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
-      set(KDE4_MEINPROC_EXECUTABLE    \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc ) +      \
set(KDE4_DCOPIDL2CPP_EXECUTABLE ${KDE4_LD_LIBRARY_PATH} \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp ) +      \
set(KDE4_KCFGC_EXECUTABLE       ${KDE4_LD_LIBRARY_PATH} \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) +      \
set(KDE4_MEINPROC_EXECUTABLE    ${KDE4_LD_LIBRARY_PATH} \
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc )  endif \
(KDE4_NEED_WRAPPER_SCRIPTS)  
    # when building kdelibs, make the dcop and kcfg rules depend on the binaries...
@@ -688,4 +688,4 @@
 set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT3_SUPPORT -DQT_NO_STL \
-DQT_NO_CAST_TO_ASCII -D_REENTRANT -DQT3_SUPPORT_WARNINGS -DKDE_DEPREACTED_WARNINGS ) \
  # always add CMAKE_CCURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR to the include \
                path to save some typing, Alex
-set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
\ No newline at end of file
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)


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