[trunk] FolderReorgProposal task: move source code to source dir

This commit is contained in:
Mathieu Malaterre 2012-10-01 07:49:52 +00:00
parent bb16d8816c
commit 93761d9ab5
11 changed files with 25 additions and 11 deletions

View File

@ -172,7 +172,6 @@ OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build Library # Build Library
include_directories(BEFORE ${OPENJPEG_BINARY_DIR})
add_subdirectory(src) add_subdirectory(src)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -203,15 +202,6 @@ add_subdirectory(wrapping)
include(CheckTypeSize) include(CheckTypeSize)
CHECK_TYPE_SIZE(ssize_t SSIZE_T) CHECK_TYPE_SIZE(ssize_t SSIZE_T)
#-----------------------------------------------------------------------------
# opj_config.h generation (2/2)
configure_file("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
"${OPENJPEG_BINARY_DIR}/opj_config.h"
@ONLY
)
#
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found) # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)

View File

@ -10,6 +10,7 @@ set(common_SRCS
# Headers file are located here: # Headers file are located here:
include_directories( include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/common ${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME} ${LCMS_INCLUDE_DIRNAME}

View File

@ -1,6 +1,7 @@
# Headers file are located here: # Headers file are located here:
include_directories( include_directories(
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 # opj_stdint.h ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/lib/openjpip ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip
${FCGI_INCLUDE_DIRS} ${FCGI_INCLUDE_DIRS}
) )

View File

@ -10,6 +10,7 @@ set(common_SRCS
# Headers file are located here: # Headers file are located here:
include_directories( include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/common ${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME} ${LCMS_INCLUDE_DIRNAME}

View File

@ -38,6 +38,7 @@ endif()
# Headers file are located here: # Headers file are located here:
include_directories( include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/lib/openmj2 ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2
${OPENJPEG_SOURCE_DIR}/src/bin/common ${OPENJPEG_SOURCE_DIR}/src/bin/common

View File

@ -1,4 +1,20 @@
include_regular_expression("^.*$") include_regular_expression("^.*$")
#-----------------------------------------------------------------------------
# opj_config.h generation (2/2)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/opj_config.h.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
@ONLY
)
#
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
)
# Defines the source code for the library # Defines the source code for the library
set(OPENJPEG_SRCS set(OPENJPEG_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/bio.c ${CMAKE_CURRENT_SOURCE_DIR}/bio.c

View File

@ -1,6 +1,7 @@
include_regular_expression("^.*$") include_regular_expression("^.*$")
include_directories( include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${FCGI_INCLUDE_DIRS} ${FCGI_INCLUDE_DIRS}
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}

View File

@ -38,6 +38,7 @@ if(APPLE)
endif() endif()
include_directories( include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/lib ${OPENJPEG_SOURCE_DIR}/src/lib
) )

View File

@ -14,6 +14,7 @@ if(WIN32)
endif(WIN32) endif(WIN32)
include_directories( include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
) )

View File

@ -12,6 +12,7 @@ include_directories(${JNI_INCLUDE_DIRS})
# required header file: # required header file:
include_directories( include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/bin/common ${OPENJPEG_SOURCE_DIR}/src/bin/common
${OPENJPEG_SOURCE_DIR}/src/bin/jp2 ${OPENJPEG_SOURCE_DIR}/src/bin/jp2