celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1660196 - in /celix/trunk/examples: CMakeLists.txt producer_consumer/consumer/CMakeLists.txt producer_consumer/database/CMakeLists.txt producer_consumer/producer/CMakeLists.txt
Date Mon, 16 Feb 2015 20:21:57 GMT
Author: abroekhuis
Date: Mon Feb 16 20:21:57 2015
New Revision: 1660196

URL: http://svn.apache.org/r1660196
Log:
Fixed linking libraries for producer/consumer example. It used the CELIX_LIBRARIES macro that
is only available when using FindCelix with CMake, which is not intended for framework development.

Modified:
    celix/trunk/examples/CMakeLists.txt
    celix/trunk/examples/producer_consumer/consumer/CMakeLists.txt
    celix/trunk/examples/producer_consumer/database/CMakeLists.txt
    celix/trunk/examples/producer_consumer/producer/CMakeLists.txt

Modified: celix/trunk/examples/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/examples/CMakeLists.txt?rev=1660196&r1=1660195&r2=1660196&view=diff
==============================================================================
--- celix/trunk/examples/CMakeLists.txt (original)
+++ celix/trunk/examples/CMakeLists.txt Mon Feb 16 20:21:57 2015
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-celix_subproject(EXAMPLES "Option to enable building the Examples" "OFF" DEPS FRAMEWORK LAUNCHER
SHELL_TUI LOG_WRITER)
+celix_subproject(EXAMPLES "Option to enable building the Examples" "OFF" DEPS FRAMEWORK DEPENDENCY_MANAGER2
LAUNCHER SHELL_TUI LOG_WRITER)
 if (EXAMPLES)
     add_subdirectory(hello_world)
     add_subdirectory(hello_world_test)

Modified: celix/trunk/examples/producer_consumer/consumer/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/examples/producer_consumer/consumer/CMakeLists.txt?rev=1660196&r1=1660195&r2=1660196&view=diff
==============================================================================
--- celix/trunk/examples/producer_consumer/consumer/CMakeLists.txt (original)
+++ celix/trunk/examples/producer_consumer/consumer/CMakeLists.txt Mon Feb 16 20:21:57 2015
@@ -28,4 +28,4 @@ bundle(consumer
 	 	private/src/activator.c
 )
 
-target_link_libraries(consumer ${CELIX_LIBRARIES})
+target_link_libraries(consumer celix_framework)

Modified: celix/trunk/examples/producer_consumer/database/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/examples/producer_consumer/database/CMakeLists.txt?rev=1660196&r1=1660195&r2=1660196&view=diff
==============================================================================
--- celix/trunk/examples/producer_consumer/database/CMakeLists.txt (original)
+++ celix/trunk/examples/producer_consumer/database/CMakeLists.txt Mon Feb 16 20:21:57 2015
@@ -30,5 +30,5 @@ bundle(database
 		private/src/reader
 )
 
-target_link_libraries(database pthread ${CELIX_LIBRARIES})
+target_link_libraries(database celix_framework)
 

Modified: celix/trunk/examples/producer_consumer/producer/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/examples/producer_consumer/producer/CMakeLists.txt?rev=1660196&r1=1660195&r2=1660196&view=diff
==============================================================================
--- celix/trunk/examples/producer_consumer/producer/CMakeLists.txt (original)
+++ celix/trunk/examples/producer_consumer/producer/CMakeLists.txt Mon Feb 16 20:21:57 2015
@@ -28,4 +28,4 @@ bundle(producer
 	 	private/src/activator.c
 )
 
-target_link_libraries(producer ${CELIX_LIBRARIES})
\ No newline at end of file
+target_link_libraries(producer celix_framework)
\ No newline at end of file



Mime
View raw message