Fix cross compiling.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1247 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/CMakeLists.txt b/codec2-dev/CMakeLists.txt
index 7a036cab01504bce2ba3c443e8fc44a54c62ed93..4dcc8170b9cffcf60a2160859b84552711656eb7 100644 (file)
--- a/codec2-dev/CMakeLists.txt
+++ b/codec2-dev/CMakeLists.txt
@@ -25,11 +25,11 @@ set(CODEC2_VERSION_MAJOR 0)
 set(CODEC2_VERSION_MINOR 2)
 # Set to patch level is needed, otherwise leave FALSE.
 set(CODEC2_VERSION_PATCH FALSE)
-set(CODEC2_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+set(CODEC2_VERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}")
 # Patch level version bumps should not change API/ABI.
-set(SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+set(SOVERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}")
 if(CODEC2_VERSION_PATCH)
-    set(PROJECT_VERSION "${CODEC2_VERSION}.${PROJECT_VERSION_PATCH}")
+    set(PROJECT_VERSION "${CODEC2_VERSION}.${CODEC2_VERSION_PATCH}")
 endif()
 
 # Set default build type
@@ -119,9 +119,9 @@ if(WIN32)
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
     set(CPACK_PACKAGE_VERSION_MAJOR ${CODEC2_VERSION_MAJOR})
     set(CPACK_PACKAGE_VERSION_MINOR ${CODEC2_VERSION_MINOR})
-        if(PROJECT_VERSION_PATCH)
+    if(CODEC2_VERSION_PATCH)
         set(CPACK_PACKAGE_VERSION_PATCH ${CODEC2_VERSION_PATCH})
-    endif(PROJECT_VERSION_PATCH)
+    endif(CODEC2_VERSION_PATCH)
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "Codec2")
     # There is a bug in NSI that does not handle full unix paths properly. Make
     # sure there is at least one set of four (4) backlasshes.

diff --git a/codec2-dev/src/CMakeLists.txt b/codec2-dev/src/CMakeLists.txt
index 6d0d294c3eeec3b77330672517e30da90d203a3b..041ad48f19d03492f6eb6a9b5e0f101dc2fb1f3e 100644 (file)
--- a/codec2-dev/src/CMakeLists.txt
+++ b/codec2-dev/src/CMakeLists.txt
@@ -94,6 +94,9 @@ if(NOT CMAKE_CROSSCOMPILING)
     # genlspdtcb
     add_executable(genlspdtcb genlspdtcb.c)
     target_link_libraries(genlspdtcb ${CMAKE_REQUIRED_LIBRARIES})
+    # Make native builds available for cross-compiling.
+    export(TARGETS generate_codebook genlspdtcb
+        FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake)
 endif(NOT CMAKE_CROSSCOMPILING)
 
 # codebook.c
@@ -152,10 +155,6 @@ add_custom_command(
     DEPENDS generate_codebook ${CODEBOOKSGE}
 )
 
-# Make native builds available for cross-compiling.
-export(TARGETS generate_codebook genlspdtcb
-    FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake)
-
 #
 # codec2 library sources
 #