Merge pull request #384 from nasa/nos3#352

[nasa/nos3#352] Updates to build in NOS3 RC 1.7.2;
nasa · Jan 13, 2025 · 911c886 · 911c886
2 parents 1e8ab55 + e23a6e5
commit 911c886
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -171,7 +171,6 @@ endif()
 # Project Specifics
 #
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -g -O0")
-set(CMAKE_CROSSCOMPILING "FALSE")
 
 include_directories(include)
 add_subdirectory(src)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -128,14 +128,9 @@ endif()
 
 # Create the app module
 if(DEFINED CFE_SYSTEM_PSPNAME)
-    set(CMAKE_INSTALL_RPATH "./${INSTALL_SUBDIR}")
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/cpu${TGTSYS_${SYSVAR}}/${INSTALL_SUBDIR}")
     add_cfe_app(crypto ${LIB_SRC_FILES})
     target_include_directories(crypto PUBLIC ../include)
-    if(NOT CMAKE_CROSSCOMPILING)
-        install(TARGETS crypto RUNTIME_DEPENDENCIES DESTINATION ${CMAKE_INSTALL_PREFIX}/${TGTSYS_${SYSVAR}}/${INSTALL_SUBDIR})
-    else()
-        install(TARGETS crypto)
-    endif()
 else() 
     # Standalone build
     add_library(crypto SHARED ${LIB_SRC_FILES})