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

List:       kde-commits
Subject:    branches/work/unity
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2006-07-11 21:28:08
Message-ID: 1152653288.730793.27003.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 561329 by neundorf:

test for bison and gperf and complain if one of them hasn't been found

Alex


 M  +12 -1     CMakeLists.txt  
 M  +7 -7      WebKit/JavaScriptCore/CMakeLists.txt  
 M  +4 -4      WebKit/WebCore/CMakeLists.txt  


--- branches/work/unity/CMakeLists.txt #561328:561329
@@ -11,10 +11,21 @@
 find_package(JPEG REQUIRED)
 find_package(PNG  REQUIRED)
 
+find_program(BISON_EXECUTABLE bison)
+find_program(GPERF_EXECUTABLE gperf)
+
+if (NOT BISON_EXECUTABLE)
+   message(FATAL_ERROR "Could not find bison")
+endif (NOT BISON_EXECUTABLE)
+
+if (NOT GPERF_EXECUTABLE)
+   message(FATAL_ERROR "Could not find gperf")
+endif (NOT GPERF_EXECUTABLE)
+
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT \
-DHAVE_CONFIG_H=1)  link_directories (${KDE4_LIB_DIR})
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
-add_subdirectory( WebKit ) 
+add_subdirectory( WebKit )
 
 
--- branches/work/unity/WebKit/JavaScriptCore/CMakeLists.txt #561328:561329
@@ -1,17 +1,17 @@
 
 project(kjs-unity)
 
-add_subdirectory( wtf ) 
-add_subdirectory( pcre ) 
+add_subdirectory( wtf )
+add_subdirectory( pcre )
 
 # Configuration checks
 check_library_exists(pthread pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP)
 check_library_exists(pthread pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP)
 
-include_directories( 
-    ${CMAKE_CURRENT_SOURCE_DIR}/pcre 
-    ${CMAKE_CURRENT_BINARY_DIR}/kjs 
-    ${CMAKE_CURRENT_SOURCE_DIR}/kjs 
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/pcre
+    ${CMAKE_CURRENT_BINARY_DIR}/kjs
+    ${CMAKE_CURRENT_SOURCE_DIR}/kjs
 
     ${QT_INCLUDES}
 )
@@ -44,7 +44,7 @@
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 
   COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/kjs
-  COMMAND bison -d -p kjsyy ${CMAKE_CURRENT_SOURCE_DIR}/kjs/grammar.y
+  COMMAND ${BISON_EXECUTABLE} -d -p kjsyy ${CMAKE_CURRENT_SOURCE_DIR}/kjs/grammar.y
   COMMAND mv grammar.tab.c ${CMAKE_CURRENT_BINARY_DIR}/kjs/grammar.cpp
   COMMAND mv grammar.tab.h ${CMAKE_CURRENT_BINARY_DIR}/kjs/grammar.h
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kjs/grammar.y
--- branches/work/unity/WebKit/WebCore/CMakeLists.txt #561328:561329
@@ -202,7 +202,7 @@
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/CSSGrammar.cpp \
${CMAKE_CURRENT_BINARY_DIR}/CSSGrammar.h  WORKING_DIRECTORY \
                ${CMAKE_CURRENT_BINARY_DIR}
-  COMMAND bison -d -p cssyy ${CMAKE_CURRENT_SOURCE_DIR}/css/CSSGrammar.y
+  COMMAND ${BISON_EXECUTABLE} -d -p cssyy \
${CMAKE_CURRENT_SOURCE_DIR}/css/CSSGrammar.y  COMMAND mv CSSGrammar.tab.c \
${CMAKE_CURRENT_BINARY_DIR}/CSSGrammar.cpp  #COMMAND rm -f CSSGrammar.tab.h
   #COMMAND touch CSSGrammar.h
@@ -222,7 +222,7 @@
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   COMMAND mkdir -p html
   COMMAND echo '\#include <string.h>' > html/HTMLEntityNames.c
-  COMMAND gperf -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 < \
${CMAKE_CURRENT_SOURCE_DIR}/html/HTMLEntityNames.gperf >> html/HTMLEntityNames.c +  \
COMMAND ${GPERF_EXECUTABLE} -a -L ANSI-C -C -G -c -o -t -k '*' -N findEntity -D -s 2 \
< ${CMAKE_CURRENT_SOURCE_DIR}/html/HTMLEntityNames.gperf >> html/HTMLEntityNames.c  
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/HTMLEntityNames.gperf
 )
@@ -231,7 +231,7 @@
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   COMMAND mkdir -p html
   COMMAND echo '\#include <string.h>' > html/DocTypeStrings.cpp
-  COMMAND gperf -CEot -L ANSI-C -k \"*\" -N findDoctypeEntry -F \
,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards < \
${CMAKE_CURRENT_SOURCE_DIR}/html/DocTypeStrings.gperf >> html/DocTypeStrings.cpp +  \
COMMAND ${GPERF_EXECUTABLE} -CEot -L ANSI-C -k \"*\" -N findDoctypeEntry -F \
,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards < \
${CMAKE_CURRENT_SOURCE_DIR}/html/DocTypeStrings.gperf >> html/DocTypeStrings.cpp  \
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/html/DocTypeStrings.gperf  )
 
@@ -239,7 +239,7 @@
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   COMMAND mkdir -p platform
   COMMAND echo '\#include <string.h>' > platform/ColorData.c
-  COMMAND gperf -CDEot -L ANSI-C -k \"*\" -N findColor -D -s 2 < \
${CMAKE_CURRENT_SOURCE_DIR}/platform/ColorData.gperf >> platform/ColorData.c +  \
COMMAND ${GPERF_EXECUTABLE} -CDEot -L ANSI-C -k \"*\" -N findColor -D -s 2 < \
${CMAKE_CURRENT_SOURCE_DIR}/platform/ColorData.gperf >> platform/ColorData.c  DEPENDS \
${CMAKE_CURRENT_SOURCE_DIR}/platform/ColorData.gperf  )
 


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