incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1102860 - in /incubator/celix/trunk: CMakeLists.txt framework/CMakeLists.txt hello_world/CMakeLists.txt launcher/CMakeLists.txt mongoose/CMakeLists.txt utils/CMakeLists.txt
Date Fri, 13 May 2011 18:40:12 GMT
Author: abroekhuis
Date: Fri May 13 18:40:11 2011
New Revision: 1102860

URL: http://svn.apache.org/viewvc?rev=1102860&view=rev
Log:
Moved FindAPR to the top level CMakeLists

Modified:
    incubator/celix/trunk/CMakeLists.txt
    incubator/celix/trunk/framework/CMakeLists.txt
    incubator/celix/trunk/hello_world/CMakeLists.txt
    incubator/celix/trunk/launcher/CMakeLists.txt
    incubator/celix/trunk/mongoose/CMakeLists.txt
    incubator/celix/trunk/utils/CMakeLists.txt

Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1102860&r1=1102859&r2=1102860&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Fri May 13 18:40:11 2011
@@ -33,6 +33,14 @@ ADD_CUSTOM_TARGET(install-fw
   -D "CMAKE_INSTALL_PREFIX=test"
   -P "cmake_install.cmake"
   )
+  
+include(FindAPR)
+IF(APR_FOUND)
+	MESSAGE(STATUS "Looking for APR - found")
+ELSE(APR_FOUND)
+	MESSAGE(FATAL_ERROR "Looking for APR - not found")
+ENDIF(APR_FOUND)
+include_directories(${APR_INCLUDE_DIR})
 
 include_directories("framework/private/include")
 include_directories("framework/public/include")
@@ -46,7 +54,7 @@ add_subdirectory(framework)
 include(Packaging.cmake)
 #add_subdirectory(dependency_manager)
 add_subdirectory(launcher)
-add_subdirectory(test)
+#add_subdirectory(test)
 
 add_subdirectory(shell)
 add_subdirectory(shell_tui)

Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1102860&r1=1102859&r2=1102860&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Fri May 13 18:40:11 2011
@@ -23,13 +23,6 @@ ELSE(ZLIB_FOUND)
 	MESSAGE(FATAL_ERROR "Looking for ZLIB - not found")
 ENDIF(ZLIB_FOUND)
 
-include(FindAPR)
-IF(APR_FOUND)
-	MESSAGE(STATUS "Looking for APR - found")
-ELSE(APR_FOUND)
-	MESSAGE(FATAL_ERROR "Looking for APR - not found")
-ENDIF(APR_FOUND)
-
 include(FindCURL)
 IF(CURL_FOUND)
 	MESSAGE(STATUS "Looking for CURL - found")
@@ -39,7 +32,6 @@ ENDIF(CURL_FOUND)
 
 add_definitions(-DUSE_FILE32API)
 aux_source_directory("private/src" SRC)
-include_directories(${APR_INCLUDE_DIR})
 include_directories(${CURL_INCLUDE_DIR})
 include_directories(${ZLIB_INCLUDE_DIR})
 include_directories("private/include")

Modified: incubator/celix/trunk/hello_world/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hello_world/CMakeLists.txt?rev=1102860&r1=1102859&r2=1102860&view=diff
==============================================================================
--- incubator/celix/trunk/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/hello_world/CMakeLists.txt Fri May 13 18:40:11 2011
@@ -15,16 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-include(FindAPR)
-
-IF(APR_FOUND)
-	MESSAGE(STATUS "Looking for APR - found")
-ELSE(APR_FOUND)
-	MESSAGE(FATAL_ERROR "Looking for APR - not found")
-ENDIF(APR_FOUND)
-
-include_directories(${APR_INCLUDE_DIR})
-
 add_library(hello_world SHARED activator)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(hello_world framework)

Modified: incubator/celix/trunk/launcher/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/launcher/CMakeLists.txt?rev=1102860&r1=1102859&r2=1102860&view=diff
==============================================================================
--- incubator/celix/trunk/launcher/CMakeLists.txt (original)
+++ incubator/celix/trunk/launcher/CMakeLists.txt Fri May 13 18:40:11 2011
@@ -15,15 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-include(FindAPR)
-IF(APR_FOUND)
-	MESSAGE(STATUS "Looking for APR - found")
-ELSE(APR_FOUND)
-	MESSAGE(FATAL_ERROR "Looking for APR - not found")
-ENDIF(APR_FOUND)
-
-include_directories(${APR_INCLUDE_DIR})
-
 add_executable(launcher launcher.c)
 
 target_link_libraries(launcher framework)

Modified: incubator/celix/trunk/mongoose/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/mongoose/CMakeLists.txt?rev=1102860&r1=1102859&r2=1102860&view=diff
==============================================================================
--- incubator/celix/trunk/mongoose/CMakeLists.txt (original)
+++ incubator/celix/trunk/mongoose/CMakeLists.txt Fri May 13 18:40:11 2011
@@ -15,16 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-include(FindAPR)
-
-IF(APR_FOUND)
-	MESSAGE(STATUS "Looking for APR - found")
-ELSE(APR_FOUND)
-	MESSAGE(FATAL_ERROR "Looking for APR - not found")
-ENDIF(APR_FOUND)
-
-include_directories(${APR_INCLUDE_DIR})
-
 add_library(mongoose STATIC mongoose.c)
 
 add_library(celix.mongoose SHARED activator)

Modified: incubator/celix/trunk/utils/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1102860&r1=1102859&r2=1102860&view=diff
==============================================================================
--- incubator/celix/trunk/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/utils/CMakeLists.txt Fri May 13 18:40:11 2011
@@ -21,6 +21,6 @@ aux_source_directory("private/src" SRC)
 include_directories("private/include")
 include_directories("public/include")
 add_library(utils SHARED ${SRC})
-target_link_libraries(utils)
+target_link_libraries(utils m)
 
 install(TARGETS utils LIBRARY DESTINATION lib COMPONENT framework)



Mime
View raw message