Revert "make contribs independant of the directory structure of picrin"
This reverts commit cdee9d9134
.
This commit is contained in:
parent
0462299bc1
commit
c78e60f41a
|
@ -1,2 +1,2 @@
|
|||
file(GLOB PARTCONT_FILES ${PICRIN_CONTRIB_DIR}/10.partcont/piclib/*.scm)
|
||||
file(GLOB PARTCONT_FILES ${PROJECT_SOURCE_DIR}/contrib/10.partcont/piclib/*.scm)
|
||||
list(APPEND PICLIB_CONTRIB_LIBS ${PARTCONT_FILES})
|
||||
|
|
|
@ -1 +1 @@
|
|||
list(APPEND PICLIB_CONTRIB_LIBS ${PICRIN_CONTRIB_DIR}/10.pretty-print/pretty-print.scm)
|
||||
list(APPEND PICLIB_CONTRIB_LIBS ${PROJECT_SOURCE_DIR}/contrib/10.pretty-print/pretty-print.scm)
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
# regex
|
||||
set(PICRIN_REGEX_DIR ${PICRIN_CONTRIB_DIR}/10.regexp)
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PICRIN_REGEX_DIR}/cmake/")
|
||||
|
||||
find_package(REGEX)
|
||||
|
||||
if (REGEX_FOUND)
|
||||
add_definitions(${REGEX_DEFINITIONS})
|
||||
include_directories(${REGEX_INCLUDE_DIR})
|
||||
|
||||
file(GLOB PICRIN_REGEX_SOURCES ${PICRIN_REGEX_DIR}/src/*.c)
|
||||
file(GLOB PICRIN_REGEX_SOURCES ${PROJECT_SOURCE_DIR}/contrib/10.regexp/src/*.c)
|
||||
|
||||
list(APPEND PICRIN_CONTRIB_INITS regexp)
|
||||
list(APPEND PICRIN_CONTRIB_LIBRARIES ${REGEX_LIBRARIES})
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
file(GLOB FOR_FILES ${PICRIN_CONTRIB_DIR}/20.for/piclib/*.scm)
|
||||
file(GLOB FOR_FILES ${PROJECT_SOURCE_DIR}/contrib/20.for/piclib/*.scm)
|
||||
list(APPEND PICLIB_CONTRIB_LIBS ${FOR_FILES})
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
set(PICRIN_CONTRIB_DIR ${PROJECT_SOURCE_DIR}/contrib)
|
||||
file(GLOB CONTRIBS ${PICRIN_CONTRIB_DIR}/*/CMakeLists.txt)
|
||||
file(GLOB CONTRIBS ${PROJECT_SOURCE_DIR}/contrib/*/CMakeLists.txt)
|
||||
list(SORT CONTRIBS)
|
||||
foreach(contrib ${CONTRIBS})
|
||||
include(${contrib})
|
||||
|
|
Loading…
Reference in New Issue