added missing files to installation package

joaoleal · Oct 11, 2013 · b2c640b · b2c640b
1 parent 99627b6
commit b2c640b
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,8 +39,8 @@ INCLUDE_DIRECTORIES( ${CPPAD_INCLUDE_DIR} "${CMAKE_SOURCE_DIR}/include" ${EIGEN3
 #         General installation information
 ################################################################################
 SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Default install path prefix")
-SET(install_export_location "${CMAKE_INSTALL_PREFIX}/share/cppadcg")
-SET(install_include_location "${CMAKE_INSTALL_PREFIX}/include/cppadcg")
+SET(install_cppadcg_include_location "${CMAKE_INSTALL_PREFIX}/include/cppadcg")
+SET(install_cppad_include_location "${CMAKE_INSTALL_PREFIX}/include/cppad")
 SET(install_library_pkg_location "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
 
 

diff --git a/debian/control b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: cppadcodegen-dev
 Architecture: any
-Depends: ${misc:Depends}, cppad-dev (>= 20130819)
+Depends: ${misc:Depends}, cppad-dev (>= 20131007)
 Description: A Package for Differentiation of C++ Algorithms that performs source code generation
 
 Package: cppadcodegen-doc

diff --git a/debian/copyright b/debian/copyright
@@ -7,9 +7,9 @@ Upstream Author(s):
 
 Copyright: 
 
-    Copyright (C) 2012 Ciengis. All Rights Reserved
+    Copyright (C) 2013 Ciengis. All Rights Reserved
 
 License:
 
-    GPLv2 or EPLv1
+    GPLv3 or EPLv1
 
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -15,15 +15,13 @@
 #
 # ----------------------------------------------------------------------------
 
-ADD_EXECUTABLE(source_generation EXCLUDE_FROM_ALL
-	source_generation.cpp)
+ADD_EXECUTABLE(source_generation source_generation.cpp)
 SET(EXAMPLES_COMMAND "COMMAND source_generation")
 ADD_CUSTOM_TARGET(example_source_generation
                   COMMAND source_generation)
 
 IF( UNIX )
-	ADD_EXECUTABLE(dynamic_linux EXCLUDE_FROM_ALL
-		dynamic_linux.cpp)
+	ADD_EXECUTABLE(dynamic_linux dynamic_linux.cpp)
 	SET(EXAMPLES_COMMAND "${EXAMPLES_COMMAND} COMMAND dynamic_linux")
 
 	TARGET_LINK_LIBRARIES(dynamic_linux ${DL_LIBRARIES})

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -17,5 +17,9 @@
 # files to be installed
 # ----------------------------------------------------------------------------
 INSTALL( DIRECTORY "cppadcg/"
-         DESTINATION ${install_include_location}
+         DESTINATION "${install_cppadcg_include_location}"
          FILES_MATCHING PATTERN "*.hpp")
+
+INSTALL( DIRECTORY "cppad/extra/"
+         DESTINATION "${install_cppad_include_location}/extra"
+         FILES_MATCHING PATTERN "*.hpp")
diff --git a/pkgconfig/cppadcg-uninstalled.pc.in b/pkgconfig/cppadcg-uninstalled.pc.in
@@ -15,4 +15,4 @@ Name:         @PROJECT_NAME@
 Description:  @cppadcg_descriptio@
 Version:      @cppadcg_versioN@
 URL:          @cppadcg_url@
-Cflags:       -I@install_include_location@
+Cflags:       -I@install_cppadcg_include_location@ -I@install_cppad_include_location@
diff --git a/pkgconfig/cppadcg.pc.in b/pkgconfig/cppadcg.pc.in
@@ -15,5 +15,5 @@ Name:         @PROJECT_NAME@
 Description:  @cppadcg_description@
 Version:      @cppadcg_version@
 URL:          @cppadcg_url@
-Cflags:       -I@install_include_location@
-Requires:     cppad >= 20121215
+Cflags:       -I@install_cppadcg_include_location@ -I@install_cppad_include_location@
+Requires:     cppad >= 20131007