Fix freedv menu shortcut in NSIS installer.

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

diff --git a/freedv-dev/CMakeLists.txt b/freedv-dev/CMakeLists.txt
index 4c28ebf182e4037e90c366ffa4ba77385cb9e258..e67d67aa996735d3ab17946dab06ac86024c7d76 100644 (file)
--- a/freedv-dev/CMakeLists.txt
+++ b/freedv-dev/CMakeLists.txt
@@ -27,8 +27,8 @@ project(FreeDV)
 #
 # Set FreeDV version and generate src/version.h
 #
-set(FREEDV_VERSION_MAJOR 0)
-set(FREEDV_VERSION_MINOR 99)
+set(FREEDV_VERSION_MAJOR 1)
+set(FREEDV_VERSION_MINOR 0)
 set(FREEDV_VERSION_PATCH FALSE)
 set(FREEDV_VERSION ${FREEDV_VERSION_MAJOR}.${FREEDV_VERSION_MINOR})
 if(FREEDV_VERSION_PATCH)
@@ -37,6 +37,8 @@ endif()
 set(FREEDV_VERSION_SUFFIX "devel")
 if(FREEDV_VERSION_SUFFIX)
     set(FREEDV_VERSION_STRING "${FREEDV_VERSION} ${FREEDV_VERSION_SUFFIX}")
+else()
+    set(FREEDV_VERSION_STRING "${FREEDV_VERSION}")
 endif()
 message(STATUS "FreeDV version: ${FREEDV_VERSION_STRING}")
 configure_file(cmake/version.h.in src/version.h @ONLY)
@@ -478,9 +480,11 @@ if(WIN32)
     set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\freedv.exe")
     set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
     set(CPACK_NSIS_PACKAGE_NAME "FreeDV")
+    set(CPACK_PACKAGE_EXECUTABLES freedv;FreeDV)
     set(CPACK_NSIS_URL_INFO_ABOUT "http://freedv.org")
     set(CPACK_NSIS_MODIFY_PATH OFF)
-    set(CPACK_NSIS_MENU_LINKS "http://freedv.org" "FreeDV Homepage")
+    set(CPACK_NSIS_MENU_LINKS
+        "http://freedv.org" "FreeDV Homepage")
     include(CPack)
 endif(WIN32)
 

diff --git a/freedv-dev/src/CMakeLists.txt b/freedv-dev/src/CMakeLists.txt
index 44ccfe7c935cdc39affd890236e2dc1e5fddc9fd..56e6255bc728e045836ba80f22b18ab7d0b2aecf 100644 (file)
--- a/freedv-dev/src/CMakeLists.txt
+++ b/freedv-dev/src/CMakeLists.txt
@@ -36,7 +36,7 @@ set(FREEDV_SOURCES
 # WIN32 is needed for Windows GUI apps and is ignored for UNIX like systems.
 add_executable(freedv WIN32 ${FREEDV_SOURCES} ${RES_FILES})
 target_link_libraries(freedv ${FREEDV_LINK_LIBS})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 if(FREEDV_STATIC_DEPS)
     add_dependencies(freedv ${FREEDV_STATIC_DEPS})
 endif(FREEDV_STATIC_DEPS)