Author: pnoltes
Date: Tue Jun 3 08:36:09 2014
New Revision: 1599448
URL: http://svn.apache.org/r1599448
Log:
CELIX-116: updated CMakeLists files for inline Celix project. e.g. removed
include with CELIX_INCLUDE_DIR and required(celix) statements.
Modified:
incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt
incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt
incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt
incubator/celix/trunk/event_admin/utils/CMakeLists.txt
Modified: incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff
==============================================================================
--- incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/event_admin/event_admin/CMakeLists.txt Tue Jun 3
08:36:09 2014
@@ -16,11 +16,10 @@
# under the License.
find_package(APR REQUIRED)
-find_package(CELIX REQUIRED)
+include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories(public/include)
include_directories(private/include)
-include_directories("${CELIX_INCLUDE_DIRS}")
#include_directories(../utils/public/include)
SET_HEADER(BUNDLE_SYMBOLICNAME "eventadmin")
Modified: incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff
==============================================================================
--- incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt (original)
+++ incubator/celix/trunk/event_admin/event_handler/CMakeLists.txt Tue Jun 3
08:36:09 2014
@@ -16,11 +16,10 @@
# under the License.
find_package(APR REQUIRED)
-find_package(CELIX REQUIRED)
+include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories(private/include)
include_directories(${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include)
-include_directories("${CELIX_INCLUDE_DIRS}")
SET_HEADER(BUNDLE_SYMBOLICNAME "eventhandler")
SET_HEADERS("Bundle-Name: Event Handler")
Modified: incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff
==============================================================================
--- incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt (original)
+++ incubator/celix/trunk/event_admin/event_publisher/CMakeLists.txt Tue Jun 3
08:36:09 2014
@@ -16,11 +16,10 @@
# under the License.
find_package(APR REQUIRED)
-find_package(CELIX REQUIRED)
+include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories(private/include)
include_directories(${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include)
-include_directories("${CELIX_INCLUDE_DIRS}")
SET_HEADER(BUNDLE_SYMBOLICNAME "event_publisher")
SET_HEADERS("Bundle-Name: Event Publisher")
Modified: incubator/celix/trunk/event_admin/utils/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/event_admin/utils/CMakeLists.txt?rev=1599448&r1=1599447&r2=1599448&view=diff
==============================================================================
--- incubator/celix/trunk/event_admin/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/event_admin/utils/CMakeLists.txt Tue Jun 3 08:36:09
2014
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
find_package(APR REQUIRED)
-find_package(CELIX REQUIRED)
-include_directories("${CELIX_INCLUDE_DIRS}")
+
+include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/event_admin/event_admin/public/include")
include_directories(public/include)
@@ -24,4 +24,4 @@ add_library(event_admin_utils STATIC pri
target_link_libraries(event_admin_utils ${APRUTIL_LIBRARY})
#install(TARGETS event_admin_utils DESTINATION lib COMPONENT framework)
#FILE(GLOB files "public/include/*.h")
-#INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
\ No newline at end of file
+#INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
