You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2012/03/01 18:15:54 UTC
svn commit: r1295682 - in /incubator/etch/trunk:
binding-c/runtime/c/CMakeLists.txt examples/example_mixin/CMakeLists.txt
examples/example_mixin/build.xml examples/helloworld/CMakeLists.txt
examples/helloworld/build.xml
Author: fitzner
Date: Thu Mar 1 17:15:54 2012
New Revision: 1295682
URL: http://svn.apache.org/viewvc?rev=1295682&view=rev
Log:
ETCH-209
CMake build for 32 bit executables on a 64 bit machine with Ubuntu 11.10
fails. Fixed library order
Change-Id: I2366691a94d6596a0450ae4bd1d4a8c7c85c6657
Modified:
incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt
incubator/etch/trunk/examples/example_mixin/CMakeLists.txt
incubator/etch/trunk/examples/example_mixin/build.xml
incubator/etch/trunk/examples/helloworld/CMakeLists.txt
incubator/etch/trunk/examples/helloworld/build.xml
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=1295682&r1=1295681&r2=1295682&view=diff
==============================================================================
--- incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-c/runtime/c/CMakeLists.txt Thu Mar 1 17:15:54 2012
@@ -31,9 +31,9 @@ ENDIF (UNIX)
add_definitions(-D_UNICODE -DUNICODE)
# APR library
-SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.5)
+SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.5)
FIND_PATH(APR_INCLUDE_DIR apr.h ${APR}/include ${APR}/include/apr-1)
-FIND_LIBRARY(APR_LIBRARY NAMES libapr-1.lib libapr-1.so PATHS ${APR}/lib)
+FIND_LIBRARY(APR_LIBRARY NAMES libapr-1.lib libapr-1.so PATHS ${APR}/lib NO_DEFAULT_PATH)
IF (APR_INCLUDE_DIR AND APR_LIBRARY)
SET(APR_FOUND TRUE)
ENDIF (APR_INCLUDE_DIR AND APR_LIBRARY)
@@ -42,9 +42,9 @@ IF (NOT APR_FOUND)
ENDIF (NOT APR_FOUND)
# APR-ICONV library
-SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.5)
+SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.5)
FIND_PATH(APR-ICONV_INCLUDE_DIR apr_iconv.h ${APR}/include ${APR}/include/apr-1)
-FIND_LIBRARY(APR-ICONV_LIBRARY NAMES libapriconv-1.lib libapriconv-1.so PATHS ${APR}/lib)
+FIND_LIBRARY(APR-ICONV_LIBRARY NAMES libapriconv-1.lib libapriconv-1.so PATHS ${APR}/lib NO_DEFAULT_PATH)
IF (APR-ICONV_INCLUDE_DIR AND APR-ICONV_LIBRARY)
SET(APR-ICONV_FOUND TRUE)
ENDIF (APR-ICONV_INCLUDE_DIR AND APR-ICONV_LIBRARY)
@@ -52,10 +52,10 @@ IF (NOT APR-ICONV_FOUND)
MESSAGE(FATAL_ERROR "Could not find libapriconv")
ENDIF (NOT APR-ICONV_FOUND)
-# APR-ICONV library
+# CUNIT library
SET(CUNIT ${ETCH_EXTERNAL_DEPENDS}/cunit/2.1)
FIND_PATH(CUNIT_INCLUDE_DIR CUnit.h ${CUNIT}/include /usr/include/CUnit)
-FIND_LIBRARY(CUNIT_LIBRARY NAMES libcunit.lib libcunit.a PATHS ${CUNIT}/lib /usr/lib)
+FIND_LIBRARY(CUNIT_LIBRARY NAMES libcunit.lib libcunit.a PATHS ${CUNIT}/lib /usr/lib NO_DEFAULT_PATH)
IF (CUNIT_INCLUDE_DIR AND CUNIT_LIBRARY)
SET(CUNIT_FOUND TRUE)
ENDIF (CUNIT_INCLUDE_DIR AND CUNIT_LIBRARY)
Modified: incubator/etch/trunk/examples/example_mixin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example_mixin/CMakeLists.txt?rev=1295682&r1=1295681&r2=1295682&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example_mixin/CMakeLists.txt (original)
+++ incubator/etch/trunk/examples/example_mixin/CMakeLists.txt Thu Mar 1 17:15:54 2012
@@ -38,7 +38,7 @@ add_definitions(-D_UNICODE -DUNICODE)
# ETCH library
SET(ETCH ${ETCH_HOME}/binding-c)
FIND_PATH(ETCH_INCLUDE_DIR etch.h ${ETCH}/include)
-FIND_LIBRARY(ETCH_LIBRARY NAMES etch.lib libetch.a PATHS ${ETCH}/lib)
+FIND_LIBRARY(ETCH_LIBRARY NAMES etch.lib libetch.a PATHS ${ETCH}/lib NO_DEFAULT_PATH)
IF (ETCH_INCLUDE_DIR AND ETCH_LIBRARY)
SET(ETCH_FOUND TRUE)
ENDIF (ETCH_INCLUDE_DIR AND ETCH_LIBRARY)
@@ -49,7 +49,7 @@ ENDIF (NOT ETCH_FOUND)
# APR library
SET(APR ${ETCH_HOME}/binding-c/extern/apr)
FIND_PATH(APR_INCLUDE_DIR apr.h ${APR}/include ${APR}/include/apr-1)
-FIND_LIBRARY(APR_LIBRARY NAMES libapr-1.lib libapr-1.so PATHS ${APR}/lib)
+FIND_LIBRARY(APR_LIBRARY NAMES libapr-1.lib libapr-1.so PATHS ${APR}/lib NO_DEFAULT_PATH)
IF (APR_INCLUDE_DIR AND APR_LIBRARY)
SET(APR_FOUND TRUE)
ENDIF (APR_INCLUDE_DIR AND APR_LIBRARY)
@@ -60,7 +60,7 @@ ENDIF (NOT APR_FOUND)
# APR-ICONV library
SET(APR ${ETCH_HOME}/binding-c/extern/apr)
FIND_PATH(APR-ICONV_INCLUDE_DIR apr_iconv.h ${APR}/include ${APR}/include/apr-1)
-FIND_LIBRARY(APR-ICONV_LIBRARY NAMES libapriconv-1.lib libapriconv-1.so PATHS ${APR}/lib)
+FIND_LIBRARY(APR-ICONV_LIBRARY NAMES libapriconv-1.lib libapriconv-1.so PATHS ${APR}/lib NO_DEFAULT_PATH)
IF (APR-ICONV_INCLUDE_DIR AND APR-ICONV_LIBRARY)
SET(APR-ICONV_FOUND TRUE)
ENDIF (APR-ICONV_INCLUDE_DIR AND APR-ICONV_LIBRARY)
@@ -70,7 +70,7 @@ ENDIF (NOT APR-ICONV_FOUND)
SET(VLD ${ETCH_HOME}/binding-c/extern/vld1.9)
FIND_PATH(VLD_INCLUDE_DIR vld.h ${VLD}/include)
-FIND_LIBRARY(VLD_LIBRARY NAMES vld.lib PATHS ${VLD}/lib)
+FIND_LIBRARY(VLD_LIBRARY NAMES vld.lib PATHS ${VLD}/lib NO_DEFAULT_PATH)
IF (VLD_INCLUDE_DIR AND VLD_LIBRARY)
SET(VLD_FOUND TRUE)
ENDIF (VLD_INCLUDE_DIR AND VLD_LIBRARY)
@@ -140,9 +140,9 @@ add_executable(etch-c-example-client
target/generated-sources/main/etch/c/examplemixin_remote.c
)
+target_link_libraries(etch-c-example-server "${ETCH_LIBRARY}")
target_link_libraries(etch-c-example-server "${APR_LIBRARY}")
target_link_libraries(etch-c-example-server "${APR-ICONV_LIBRARY}")
-target_link_libraries(etch-c-example-server "${ETCH_LIBRARY}")
IF (VLD_FOUND)
target_link_libraries(etch-c-example-server "${VLD_LIBRARY}")
ENDIF(VLD_FOUND)
@@ -151,9 +151,9 @@ set_target_properties(etch-c-example-ser
ENDIF (UNIX)
set_target_properties(etch-c-example-server PROPERTIES OUTPUT_NAME "example-server")
+target_link_libraries(etch-c-example-client "${ETCH_LIBRARY}")
target_link_libraries(etch-c-example-client "${APR_LIBRARY}")
target_link_libraries(etch-c-example-client "${APR-ICONV_LIBRARY}")
-target_link_libraries(etch-c-example-client "${ETCH_LIBRARY}")
IF (VLD_FOUND)
target_link_libraries(etch-c-example-client "${VLD_LIBRARY}")
ENDIF(VLD_FOUND)
Modified: incubator/etch/trunk/examples/example_mixin/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example_mixin/build.xml?rev=1295682&r1=1295681&r2=1295682&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example_mixin/build.xml (original)
+++ incubator/etch/trunk/examples/example_mixin/build.xml Thu Mar 1 17:15:54 2012
@@ -216,7 +216,7 @@
<target name="build-c" depends="generate-sources" if="USE.cmake">
<cmake srcdir="${basedir}" bindir="${basedir}/target" buildtype="Debug" >
- <variable name="ETCH_HOME" type="PATH" value="${etch.home}" />
+ <variable name="ETCH_HOME" type="PATH" value="${build.ETCH_HOME}" />
</cmake>
<copy todir="${bin}" flatten="true">
<fileset dir="${basedir}/target/" >
Modified: incubator/etch/trunk/examples/helloworld/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/CMakeLists.txt?rev=1295682&r1=1295681&r2=1295682&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/CMakeLists.txt (original)
+++ incubator/etch/trunk/examples/helloworld/CMakeLists.txt Thu Mar 1 17:15:54 2012
@@ -38,7 +38,7 @@ add_definitions(-D_UNICODE -DUNICODE)
# ETCH library
SET(ETCH ${ETCH_HOME}/binding-c)
FIND_PATH(ETCH_INCLUDE_DIR etch.h ${ETCH}/include)
-FIND_LIBRARY(ETCH_LIBRARY NAMES etch.lib libetch.a PATHS ${ETCH}/lib)
+FIND_LIBRARY(ETCH_LIBRARY NAMES etch.lib libetch.a PATHS ${ETCH}/lib NO_DEFAULT_PATH)
IF (ETCH_INCLUDE_DIR AND ETCH_LIBRARY)
SET(ETCH_FOUND TRUE)
ENDIF (ETCH_INCLUDE_DIR AND ETCH_LIBRARY)
@@ -49,7 +49,7 @@ ENDIF (NOT ETCH_FOUND)
# APR library
SET(APR ${ETCH_HOME}/binding-c/extern/apr)
FIND_PATH(APR_INCLUDE_DIR apr.h ${APR}/include ${APR}/include/apr-1)
-FIND_LIBRARY(APR_LIBRARY NAMES libapr-1.lib libapr-1.so PATHS ${APR}/lib)
+FIND_LIBRARY(APR_LIBRARY NAMES libapr-1.lib libapr-1.so PATHS ${APR}/lib NO_DEFAULT_PATH)
IF (APR_INCLUDE_DIR AND APR_LIBRARY)
SET(APR_FOUND TRUE)
ENDIF (APR_INCLUDE_DIR AND APR_LIBRARY)
@@ -60,7 +60,7 @@ ENDIF (NOT APR_FOUND)
# APR-ICONV library
SET(APR ${ETCH_HOME}/binding-c/extern/apr)
FIND_PATH(APR-ICONV_INCLUDE_DIR apr_iconv.h ${APR}/include ${APR}/include/apr-1)
-FIND_LIBRARY(APR-ICONV_LIBRARY NAMES libapriconv-1.lib libapriconv-1.so PATHS ${APR}/lib)
+FIND_LIBRARY(APR-ICONV_LIBRARY NAMES libapriconv-1.lib libapriconv-1.so PATHS ${APR}/lib NO_DEFAULT_PATH)
IF (APR-ICONV_INCLUDE_DIR AND APR-ICONV_LIBRARY)
SET(APR-ICONV_FOUND TRUE)
ENDIF (APR-ICONV_INCLUDE_DIR AND APR-ICONV_LIBRARY)
@@ -107,17 +107,17 @@ add_executable(etch-c-helloworld-client
target/generated-sources/main/etch/c/helloworld_remote.c
)
+target_link_libraries(etch-c-helloworld-server "${ETCH_LIBRARY}")
target_link_libraries(etch-c-helloworld-server "${APR_LIBRARY}")
target_link_libraries(etch-c-helloworld-server "${APR-ICONV_LIBRARY}")
-target_link_libraries(etch-c-helloworld-server "${ETCH_LIBRARY}")
IF (UNIX)
set_target_properties(etch-c-helloworld-server PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
ENDIF (UNIX)
set_target_properties(etch-c-helloworld-server PROPERTIES OUTPUT_NAME "helloworld-server")
+target_link_libraries(etch-c-helloworld-client "${ETCH_LIBRARY}")
target_link_libraries(etch-c-helloworld-client "${APR_LIBRARY}")
target_link_libraries(etch-c-helloworld-client "${APR-ICONV_LIBRARY}")
-target_link_libraries(etch-c-helloworld-client "${ETCH_LIBRARY}")
IF (UNIX)
set_target_properties(etch-c-helloworld-client PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
ENDIF (UNIX)
Modified: incubator/etch/trunk/examples/helloworld/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/build.xml?rev=1295682&r1=1295681&r2=1295682&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/build.xml (original)
+++ incubator/etch/trunk/examples/helloworld/build.xml Thu Mar 1 17:15:54 2012
@@ -216,7 +216,7 @@
<target name="build-c" depends="generate-sources" if="USE.cmake">
<cmake srcdir="${basedir}" bindir="${basedir}/target" buildtype="Debug" >
- <variable name="ETCH_HOME" type="PATH" value="${etch.home}" />
+ <variable name="ETCH_HOME" type="PATH" value="${build.ETCH_HOME}" />
</cmake>
<copy todir="${bin}" flatten="true">
<fileset dir="${basedir}/target/" >