svn commit: r1352045 - in /incubator/celix/trunk/device_access: CMakeLists.txt device_access/CMakeLists.txt driver_locator/CMakeLists.txt example/base_driver/CMakeLists.txt example/consuming_driver/CMakeLists.txt example/refining_driver/CMakeLists.txt

[pn...@apache.org]

Author: pnoltes
Date: Wed Jun 20 11:10:14 2012
New Revision: 1352045

URL: http://svn.apache.org/viewvc?rev=1352045&view=rev
Log:
CELIX-29: Updated CMakeLists.txt's. Changed ${CELIX_LIBRARY} to framework and ${UTILS_LIBRARY} to utils.

Modified:
    incubator/celix/trunk/device_access/CMakeLists.txt
    incubator/celix/trunk/device_access/device_access/CMakeLists.txt
    incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt
    incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
    incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
    incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt

Modified: incubator/celix/trunk/device_access/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/CMakeLists.txt?rev=1352045&r1=1352044&r2=1352045&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/CMakeLists.txt Wed Jun 20 11:10:14 2012
@@ -15,9 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-link_directories("${PROJECT_SOURCE_DIR}/framework/lib")
-
-
 add_subdirectory(device_access)
 add_subdirectory(driver_locator)
 

Modified: incubator/celix/trunk/device_access/device_access/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/device_access/CMakeLists.txt?rev=1352045&r1=1352044&r2=1352045&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/device_access/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/device_access/CMakeLists.txt Wed Jun 20 11:10:14 2012
@@ -29,4 +29,4 @@ include_directories("${PROJECT_SOURCE_DI
 include_directories("public/include")
 include_directories("private/include")
 
-target_link_libraries(device_manager ${CELIX_LIBRARY} ${UTILS_LIBRARY} ${APR_LIBRARY})
+target_link_libraries(device_manager framework utils ${APR_LIBRARY})

Modified: incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt?rev=1352045&r1=1352044&r2=1352045&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/driver_locator/CMakeLists.txt Wed Jun 20 11:10:14 2012
@@ -24,4 +24,4 @@ include_directories(${PROJECT_SOURCE_DIR
 include_directories(private/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(driver_locator utils ${CELIX_LIBRARY} ${APR_LIBRARY})
+target_link_libraries(driver_locator utils framework ${APR_LIBRARY})

Modified: incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt?rev=1352045&r1=1352044&r2=1352045&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/example/base_driver/CMakeLists.txt Wed Jun 20 11:10:14 2012
@@ -27,4 +27,4 @@ include_directories(private/include)
 include_directories(public/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(base_driver utils ${CELIX_LIBRARY} ${APR_LIBRARY})
+target_link_libraries(base_driver utils framework ${APR_LIBRARY})

Modified: incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt?rev=1352045&r1=1352044&r2=1352045&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/example/consuming_driver/CMakeLists.txt Wed Jun 20 11:10:14 2012
@@ -27,4 +27,4 @@ include_directories(${PROJECT_SOURCE_DIR
 include_directories(private/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(word_consumingdriver utils ${CELIX_LIBRARY} ${APR_LIBRARY})
+target_link_libraries(word_consumingdriver utils framework ${APR_LIBRARY})

Modified: incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt?rev=1352045&r1=1352044&r2=1352045&view=diff
==============================================================================
--- incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt (original)
+++ incubator/celix/trunk/device_access/example/refining_driver/CMakeLists.txt Wed Jun 20 11:10:14 2012
@@ -28,4 +28,4 @@ include_directories(private/include)
 include_directories(public/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-target_link_libraries(char_refiningdriver utils ${CELIX_LIBRARY} ${APR_LIBRARY})
+target_link_libraries(char_refiningdriver utils framework ${APR_LIBRARY})