Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] CMake: remove redundant logic (#6971)

Browse Source
This commit is contained in:
Gold856
2024-08-16 00:36:45 -04:00
committed by GitHub
parent 0c58426f4c
commit dc25c13051
5 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -53,12 +53,6 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
# which point to directories outside the build tree to the install RPATH
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# the RPATH to be used when installing, but only if it's not a system directory
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
if("${isSystemDir}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif()
# Options for building certain parts of the repo. Everything is built by default.
option(BUILD_SHARED_LIBS "Build with shared libs (needed for JNI)" ON)
option(WITH_JAVA "Include Java and JNI in the build" ON)
@@ -328,7 +322,7 @@ if(WITH_WPILIB)
add_subdirectory(developerRobot)
endif()
if(WITH_SIMULATION_MODULES AND NOT WITH_EXTERNAL_HAL)
if(WITH_SIMULATION_MODULES)
add_subdirectory(simulation)
endif()

2
glass/CMakeLists.txt
View File

@@ -15,7 +15,6 @@ set_target_properties(libglass PROPERTIES DEBUG_POSTFIX "d")
if(NOT MSVC)
set_target_properties(libglass PROPERTIES OUTPUT_NAME "glass")
endif()
set_property(TARGET libglass PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET libglass PROPERTY FOLDER "libraries")
@@ -43,7 +42,6 @@ set_target_properties(libglassnt PROPERTIES DEBUG_POSTFIX "d")
if(NOT MSVC)
set_target_properties(libglassnt PROPERTIES OUTPUT_NAME "glassnt")
endif()
set_property(TARGET libglassnt PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET libglassnt PROPERTY FOLDER "libraries")

2
simulation/halsim_ws_core/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ file(GLOB halsim_ws_core_src src/main/native/cpp/*.cpp)
add_library(halsim_ws_core STATIC ${halsim_ws_core_src})
wpilib_target_warnings(halsim_ws_core)
set_target_properties(halsim_ws_core PROPERTIES DEBUG_POSTFIX "d" POSITION_INDEPENDENT_CODE ON)
set_target_properties(halsim_ws_core PROPERTIES DEBUG_POSTFIX "d")
target_link_libraries(halsim_ws_core PUBLIC hal wpinet)
target_include_directories(halsim_ws_core PUBLIC src/main/native/include)

4
thirdparty/imgui_suite/CMakeLists.txt vendored
View File

@@ -1,12 +1,9 @@
include(LinkMacOSGUI)
set(SAVE_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF)
set(GLFW_INSTALL OFF)
add_subdirectory("glfw")
set_property(TARGET glfw PROPERTY POSITION_INDEPENDENT_CODE ON)
set(BUILD_SHARED_LIBS ${SAVE_BUILD_SHARED_LIBS})
export(TARGETS glfw FILE glfw.cmake NAMESPACE glfw::)
@@ -54,7 +51,6 @@ target_include_directories(
PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
)
set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)
target_compile_features(imgui PUBLIC cxx_std_20)
install(TARGETS imgui EXPORT imgui)

1
wpigui/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ file(GLOB wpigui_unix_src src/main/native/opengl3/*.cpp)
add_library(wpigui STATIC ${wpigui_src})
set_target_properties(wpigui PROPERTIES DEBUG_POSTFIX "d")
set_property(TARGET wpigui PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET wpigui PROPERTY FOLDER "libraries")