KDE/kdelibs/kjs

[Peter Kümmel]

Alexander Neundorf wrote:
> SVN commit 506818 by neundorf:
> 
> -restore CMakeLists.txt
> 
> Peter, please be a bit more careful with your commits.

You are right, this one was too fast.

> Where should REGEXP_INCLUDE_DIR come from ? 

Why did you include the list of headers to the source files ? This shouldn't be necessary.

cmake does not create the*.lut.h files when they are not part of the source.

> If it doesn't work, ask on kde-buildsystem at kde.org

the configure process don't complain about no regex library.
teher is no pthread  on windows.

> Are you sure with all your commits regarding fakes.c and kdecore ?

Pretty sure, I've discussed it with Christian.

> Is ifdefing the #warning pragmas the recommended way to handle this ?

There are about 120 ifdefed #warnings, if've added 5-10.

> 
> CCMAIL: kde-buildsystem at kde.org
> CCMAIL: syntheticpp at gmx.net
> 
> Alex
> 
> 
> 
> 
>  M  +2 -11     CMakeLists.txt  
> 
> 
> --- trunk/KDE/kdelibs/kjs/CMakeLists.txt #506817:506818
> @@ -2,7 +2,7 @@
>  
>  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/global.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/global.h )
>  
> -include_directories( ${REGEXP_INCUDE_DIR}  ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
> +include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
>  
>  if(PCRE_FOUND)
>     include_directories(${PCRE_INCLUDE_DIR})
> @@ -20,9 +20,6 @@
>        COMMAND ${PERL_EXECUTABLE}
>        ARGS ${CREATE_HASH_TABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_in_FILE} -i > ${CMAKE_CURRENT_BINARY_DIR}/${_out_FILE}
>        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_in_FILE} )
> -
> -   set(${generated_lut_h} ${generated_lut_h} ${_out_FILE})
> -   
>  endmacro(CREATE_LUT)
>  
>  create_lut(date_object.cpp date_object.lut.h date_object.cpp)
> @@ -69,20 +66,14 @@
>  dtoa.cpp
>  fpconst.cpp
>  JSLock.cpp
> -${generated_lut_h}
>  )
>  
>  kde4_automoc(${kjs_LIB_SRCS})
>  
>  kde4_add_library(kjs SHARED ${kjs_LIB_SRCS})
>  
> -target_link_libraries(kjs  ${QT_AND_KDECORE_LIBS} ${REGEXP_LIB} m kxmlcore pthread )
> +target_link_libraries(kjs  ${QT_AND_KDECORE_LIBS} m kxmlcore pthread )
>  
> -if(WIN32)
> -#target_link_libraries(kjs .lib )
> -add_definitions( -DHAVE_PCREPOSIX )
> -endif(WIN32)
> -
>  if(PCRE_FOUND)
>     target_link_libraries(kjs ${PCRE_LIBRARY})
>  endif(PCRE_FOUND)
> 
>