Merge pull request #50 from passware/enkey/cases/POS-5043

4 files changed, 19 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7422108..abe02d76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ FIND_PACKAGE(CURL)
 FIND_PACKAGE(LibXml2)
 FIND_PACKAGE(LibXslt)
 #FIND_PACKAGE(YAJL)
-FIND_PACKAGE(Perl  REQUIRED)
+FIND_PACKAGE(Perl REQUIRED)
 FIND_PACKAGE(BISON 3.4 REQUIRED)
 FIND_PACKAGE(FLEX 2.5.19 REQUIRED)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6435836c..77e17990 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@
 #
 
 IF(RAPTOR_PARSER_RDFA)
-	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/librdfa)
+	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../librdfa)
 ENDIF(RAPTOR_PARSER_RDFA)
 
 # ** Parser sources **
@@ -41,7 +41,7 @@ IF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
 
   ADD_CUSTOM_TARGET(turtle_parser_tgt DEPENDS turtle_tables_tgt ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.h)
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c
     DEPENDS turtle_tables_tgt)
 
   # Generate the turtle lexer
@@ -52,8 +52,8 @@ IF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
 
   ADD_CUSTOM_TARGET(turtle_lexer_tgt DEPENDS turtle_flex_tgt)
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.t > ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.h > ${CMAKE_CURRENT_BINARY_DIR}/t
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.t > ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.c
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.h > ${CMAKE_CURRENT_BINARY_DIR}/t
     COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/t ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.h
     DEPENDS turtle_flex_tgt)
 ENDIF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
@@ -137,17 +137,17 @@ IF(RAPTOR_XML STREQUAL "libxml")
 ENDIF(RAPTOR_XML STREQUAL "libxml")
 IF(RAPTOR_PARSER_RDFA)
 	SET(raptor_librdfa_sources
-		${CMAKE_SOURCE_DIR}/librdfa/context.c
-		${CMAKE_SOURCE_DIR}/librdfa/curie.c
-		${CMAKE_SOURCE_DIR}/librdfa/iri.c
-		${CMAKE_SOURCE_DIR}/librdfa/language.c
-		${CMAKE_SOURCE_DIR}/librdfa/lists.c
-		${CMAKE_SOURCE_DIR}/librdfa/namespace.c
-		${CMAKE_SOURCE_DIR}/librdfa/rdfa.c
-		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.c
-		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.c
-		${CMAKE_SOURCE_DIR}/librdfa/subject.c
-		${CMAKE_SOURCE_DIR}/librdfa/triple.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/context.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/curie.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/iri.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/language.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/lists.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/namespace.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/rdfa.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/rdfa_utils.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/strtok_r.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/subject.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/triple.c
 # 		${CMAKE_SOURCE_DIR}/librdfa/rdfa.h
 # 		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.h
 # 		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.h
@@ -169,7 +169,7 @@ IF(RAPTOR_PARSEDATE)
 
   ADD_CUSTOM_TARGET(parsedate_tgt DEPENDS parsedate_tables_tgt ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c ${CMAKE_CURRENT_BINARY_DIR}/parsedate.h)
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c
     DEPENDS parsedate_tables_tgt)
 ENDIF(RAPTOR_PARSEDATE)
 
diff --git a/src/raptor_config_cmake.h.in b/src/raptor_config_cmake.h.in
index e4e98081..2e1582b2 100644
--- a/src/raptor_config_cmake.h.in
+++ b/src/raptor_config_cmake.h.in
@@ -15,6 +15,7 @@
 #cmakedefine HAVE_UNISTD_H
 #cmakedefine HAVE_TIME_H
 #cmakedefine HAVE_SYS_PARAM_H
+#cmakedefine HAVE_TIME_H
 #cmakedefine HAVE_SYS_STAT_H
 #cmakedefine HAVE_SYS_STAT_H
 #cmakedefine HAVE_SYS_TIME_H
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 31c0dd1e..0067e4c2 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 
 INCLUDE_DIRECTORIES(BEFORE
-	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_CURRENT_SOURCE_DIR}/../src
 	${CMAKE_BINARY_DIR}/src
 	${CMAKE_CURRENT_SOURCE_DIR}
 )