summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Ibanez <luis.ibanez@gmail.com>2010-08-31 23:37:21 +0000
committerLuis Ibanez <luis.ibanez@gmail.com>2010-08-31 23:37:21 +0000
commita56fbe42a4a6a03be35c42e6765925054e2c7bce (patch)
tree6c939426cf616e2f66b4464c8331b5068587557e
parent9427107b9447fca79c66e8112627b0b450835363 (diff)
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".
-rw-r--r--jp3d/CMakeLists.txt7
-rw-r--r--jp3d/codec/CMakeLists.txt5
2 files changed, 7 insertions, 5 deletions
diff --git a/jp3d/CMakeLists.txt b/jp3d/CMakeLists.txt
index b560ec71..ede8b83d 100644
--- a/jp3d/CMakeLists.txt
+++ b/jp3d/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/jp3d/codec/CMakeLists.txt b/jp3d/codec/CMakeLists.txt
index 87bdc025..5ed13e70 100644
--- a/jp3d/codec/CMakeLists.txt
+++ b/jp3d/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)