You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by gr...@apache.org on 2010/09/23 10:34:24 UTC
svn commit: r1000350 - in /incubator/etch/trunk/binding-c/runtime/c:
CMakeLists.txt src/main/CMakeLists.txt src/test/CMakeLists.txt
Author: grandyho
Date: Thu Sep 23 08:34:24 2010
New Revision: 1000350
URL: http://svn.apache.org/viewvc?rev=1000350&view=rev
Log:
[ETCH-88] -m32 added for unix build. now in CMakeLists.txt
Modified:
incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt
incubator/etch/trunk/binding-c/runtime/c/src/main/CMakeLists.txt
incubator/etch/trunk/binding-c/runtime/c/src/test/CMakeLists.txt
Modified: incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt?rev=1000350&r1=1000349&r2=1000350&view=diff
==============================================================================
--- incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt Thu Sep 23 08:34:24 2010
@@ -27,7 +27,6 @@ ENDIF (NOT ETCH_EXTERNAL_DEPENDS)
# Set definitions
IF (UNIX)
add_definitions(-D_GNU_SOURCE -D_REENTRANT -DLINUX=2 -D__LINUX__)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
ENDIF (UNIX)
add_definitions(-D_UNICODE -DUNICODE)
Modified: incubator/etch/trunk/binding-c/runtime/c/src/main/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-c/runtime/c/src/main/CMakeLists.txt?rev=1000350&r1=1000349&r2=1000350&view=diff
==============================================================================
--- incubator/etch/trunk/binding-c/runtime/c/src/main/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-c/runtime/c/src/main/CMakeLists.txt Thu Sep 23 08:34:24 2010
@@ -101,5 +101,9 @@ add_library (etch-c STATIC
target_link_libraries(etch-c "${APR_LIBRARY}")
target_link_libraries(etch-c "${APR-ICONV_LIBRARY}")
target_link_libraries(etch-c "${CUNIT_LIBRARY}")
+
+IF (UNIX)
+set_target_properties(etch-c PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+ENDIF (UNIX)
set_target_properties(etch-c PROPERTIES OUTPUT_NAME "etch")
Modified: incubator/etch/trunk/binding-c/runtime/c/src/test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-c/runtime/c/src/test/CMakeLists.txt?rev=1000350&r1=1000349&r2=1000350&view=diff
==============================================================================
--- incubator/etch/trunk/binding-c/runtime/c/src/test/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-c/runtime/c/src/test/CMakeLists.txt Thu Sep 23 08:34:24 2010
@@ -63,6 +63,10 @@ add_executable(etch-c-test
transport/test_messagizer.c
transport/test_mailboxmgr.c
)
+
target_link_libraries (etch-c-test etch-c)
+IF (UNIX)
+set_target_properties(etch-c-test PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+ENDIF (UNIX)