diff options
author | Sven Gothel <[email protected]> | 2020-12-21 12:44:58 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2020-12-21 12:44:58 +0100 |
commit | d7ccc4c6161df71dc7750b6ae25f58619dda4a1b (patch) | |
tree | 495088a1064582ff434c9d83907ab00c087ac667 | |
parent | de495fb8d69680f60a9dabca71e28c94b22b41fd (diff) |
cmake: Move jaucpp -> jaulib (source locations and add_subdirectory(jaulib))
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | java/jni/direct_bt/CMakeLists.txt | 6 | ||||
-rw-r--r-- | java/jni/tinyb/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/direct_bt/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/tinyb/CMakeLists.txt | 10 | ||||
-rw-r--r-- | test/direct_bt/CMakeLists.txt | 2 |
7 files changed, 20 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d7ce2c2..fd724343 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,7 +135,7 @@ set (tinyb_DOCS_DIR documentation) find_path (SYSTEM_USR_DIR "stdlib.h") include_directories (${SYSTEM_USR_DIR}) -add_subdirectory (jaucpp) +add_subdirectory (jaulib) add_subdirectory (src/direct_bt) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 5b1a02c6..61ac730b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${PROJECT_SOURCE_DIR}/jaucpp/include + ${PROJECT_SOURCE_DIR}/jaulib/include ${PROJECT_SOURCE_DIR}/api ) diff --git a/java/jni/direct_bt/CMakeLists.txt b/java/jni/direct_bt/CMakeLists.txt index 26555591..e539d1ca 100644 --- a/java/jni/direct_bt/CMakeLists.txt +++ b/java/jni/direct_bt/CMakeLists.txt @@ -6,7 +6,7 @@ if (JNI_FOUND) endif (JNI_FOUND) set (direct_bt_LIB_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/jaucpp/include + ${PROJECT_SOURCE_DIR}/jaulib/include ${PROJECT_SOURCE_DIR}/api ${PROJECT_SOURCE_DIR}/api/direct_bt ${PROJECT_SOURCE_DIR}/include @@ -20,8 +20,8 @@ include_directories( ) set (direct_bt_JNI_SRCS - ${PROJECT_SOURCE_DIR}/jaucpp/java/jni/jni_mem.cxx - ${PROJECT_SOURCE_DIR}/jaucpp/java/jni/helper_jni.cxx + ${PROJECT_SOURCE_DIR}/jaulib/java/jni/jni_mem.cxx + ${PROJECT_SOURCE_DIR}/jaulib/java/jni/helper_jni.cxx ${PROJECT_SOURCE_DIR}/java/jni/helper_base.cxx ${PROJECT_SOURCE_DIR}/java/jni/BluetoothFactory.cxx ${PROJECT_SOURCE_DIR}/java/jni/BluetoothUtils.cxx diff --git a/java/jni/tinyb/CMakeLists.txt b/java/jni/tinyb/CMakeLists.txt index efdf9db4..2ae64464 100644 --- a/java/jni/tinyb/CMakeLists.txt +++ b/java/jni/tinyb/CMakeLists.txt @@ -6,7 +6,7 @@ if (JNI_FOUND) endif (JNI_FOUND) set (tinyb_LIB_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/jaucpp/include + ${PROJECT_SOURCE_DIR}/jaulib/include ${PROJECT_SOURCE_DIR}/api ${PROJECT_SOURCE_DIR}/api/direct_bt ${PROJECT_SOURCE_DIR}/api/tinyb @@ -21,9 +21,9 @@ include_directories( ) set (tinyb_JNI_SRCS - ${PROJECT_SOURCE_DIR}/jaucpp/java/jni/jni_mem.cxx - ${PROJECT_SOURCE_DIR}/jaucpp/java/jni/helper_jni.cxx - ${PROJECT_SOURCE_DIR}/jaucpp/src/basic_types.cpp + ${PROJECT_SOURCE_DIR}/jaulib/java/jni/jni_mem.cxx + ${PROJECT_SOURCE_DIR}/jaulib/java/jni/helper_jni.cxx + ${PROJECT_SOURCE_DIR}/jaulib/src/basic_types.cpp ${PROJECT_SOURCE_DIR}/java/jni/helper_base.cxx ${PROJECT_SOURCE_DIR}/java/jni/BluetoothFactory.cxx ${PROJECT_SOURCE_DIR}/java/jni/BluetoothUtils.cxx diff --git a/src/direct_bt/CMakeLists.txt b/src/direct_bt/CMakeLists.txt index 6c4dfdfd..7cb66f36 100644 --- a/src/direct_bt/CMakeLists.txt +++ b/src/direct_bt/CMakeLists.txt @@ -1,5 +1,5 @@ set (direct_bt_LIB_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/jaucpp/include + ${PROJECT_SOURCE_DIR}/jaulib/include ${PROJECT_SOURCE_DIR}/api ${PROJECT_SOURCE_DIR}/api/direct_bt ${PROJECT_SOURCE_DIR}/include @@ -11,10 +11,10 @@ include_directories( ) set (direct_bt_LIB_SRCS - ${PROJECT_SOURCE_DIR}/jaucpp/src/dfa_utf8_decode.cpp - ${PROJECT_SOURCE_DIR}/jaucpp/src/environment.cpp - ${PROJECT_SOURCE_DIR}/jaucpp/src/debug.cpp - ${PROJECT_SOURCE_DIR}/jaucpp/src/basic_types.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/dfa_utf8_decode.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/environment.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/debug.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/basic_types.cpp ${PROJECT_SOURCE_DIR}/src/ieee11073/DataTypes.cpp ${PROJECT_SOURCE_DIR}/src/direct_bt/UUID.cpp ${PROJECT_SOURCE_DIR}/src/direct_bt/BTTypes.cpp diff --git a/src/tinyb/CMakeLists.txt b/src/tinyb/CMakeLists.txt index 6dbdb91f..23d76e48 100644 --- a/src/tinyb/CMakeLists.txt +++ b/src/tinyb/CMakeLists.txt @@ -1,5 +1,5 @@ set (tinyb_LIB_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/jaucpp/include + ${PROJECT_SOURCE_DIR}/jaulib/include ${PROJECT_SOURCE_DIR}/api ${PROJECT_SOURCE_DIR}/api/tinyb ${PROJECT_SOURCE_DIR}/include @@ -14,10 +14,10 @@ include_directories( ) set (tinyb_LIB_SRCS - ${PROJECT_SOURCE_DIR}/jaucpp/src/dfa_utf8_decode.cpp - ${PROJECT_SOURCE_DIR}/jaucpp/src/environment.cpp - ${PROJECT_SOURCE_DIR}/jaucpp/src/debug.cpp - ${PROJECT_SOURCE_DIR}/jaucpp/src/basic_types.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/dfa_utf8_decode.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/environment.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/debug.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/basic_types.cpp ${PROJECT_SOURCE_DIR}/src/tinyb/BluetoothObject.cpp ${PROJECT_SOURCE_DIR}/src/tinyb/BluetoothEvent.cpp ${PROJECT_SOURCE_DIR}/src/tinyb/BluetoothManager.cpp diff --git a/test/direct_bt/CMakeLists.txt b/test/direct_bt/CMakeLists.txt index 45151d5c..4ec160cb 100644 --- a/test/direct_bt/CMakeLists.txt +++ b/test/direct_bt/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ${PROJECT_SOURCE_DIR}/include/cppunit - ${PROJECT_SOURCE_DIR}/jaucpp/include + ${PROJECT_SOURCE_DIR}/jaulib/include ${PROJECT_SOURCE_DIR}/api ) |