brakująca zależność cmake dla java-deb i drobiazgi

Marcin Woliński
1 parent 60d4fa47
Showing 3 changed files with 21 additions and 4 deletions
morfeusz/cli/cli.cpp
morfeusz/wrappers/java/CMakeLists.txt
toolchains/Toolchain-Linux-native.cmake
@@ -16,7 +16,7 @@ namespace morfeusz {
             UTF8;
 #endif
  
-    static inline void printCLIUsage(int argc, const char** argv, MorfeuszProcessorType processorType, ezOptionParser& opt, ostream& out) {
+    static inline void printCLIUsage(int , const char** , MorfeuszProcessorType , ezOptionParser& opt, ostream& out) {
         string usage;
         opt.getUsage(usage);
         out << usage;
  
-set (JMORFEUSZ_VERSION "0.1.0")
+set (JMORFEUSZ_VERSION "${Morfeusz_LIB_VERSION}")
 find_package(JNI REQUIRED)
 include(UseJava)
 find_package(Java REQUIRED)
@@ -93,6 +93,8 @@ add_custom_target(package-java
     DEPENDS jmorfeusz package-javadoc jmorfeusz-copy-readme libjmorfeusz)
  
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    add_custom_target(java-deb
-        COMMAND "${PROJECT_SOURCE_DIR}/createJavaDeb.sh" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}")
+  add_custom_target(java-deb
+    COMMAND "${PROJECT_SOURCE_DIR}/createJavaDeb.sh" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}"
+    DEPENDS jmorfeusz libjmorfeusz
+    )
 endif ()
+### A toolchain for building Morfeusz for Linux without cross-compilation
+
+set (CMAKE_SYSTEM_NAME Linux)
+set (CMAKE_SYSTEM_VERSION 1)
+set (CMAKE_C_COMPILER   gcc)
+set (CMAKE_CXX_COMPILER g++)
+
+set (CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}")
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search 
+# programs in the host environment
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)