From 760205958de7625d216dabf00503e9a407a9bbf2 Mon Sep 17 00:00:00 2001 From: Luis Ibanez Date: Tue, 31 Aug 2010 23:37:21 +0000 Subject: [PATCH] COMP: Moving to the parent directory the set INCLUDE_DIRECTORIES command. Given that files in "codec" look for files in "libjp3dvm", and files in "libjp3dvm" look for header files in "codec". --- CMakeLists.txt | 7 +++++++ codec/CMakeLists.txt | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b560ec71..ede8b83d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,13 @@ #VER_MAJOR = 1 #VER_MINOR = 0.0 +# Headers file are located here: +INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/codec + ${CMAKE_CURRENT_SOURCE_DIR}/libjp3dvm + ) + + SUBDIRS( libjp3dvm codec diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt index 87bdc025..5ed13e70 100644 --- a/codec/CMakeLists.txt +++ b/codec/CMakeLists.txt @@ -25,11 +25,6 @@ IF(DONT_HAVE_GETOPT) ENDIF(DONT_HAVE_GETOPT) -# Headers file are located here: -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR}/../libjp3dvm - ) - # Do the proper thing when building static...if only there was configured # headers or def files instead #IF(NOT BUILD_SHARED_LIBS)