Skip to content

Fix warnings. #1343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luciansmith wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix warnings. #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ jobs:
-DBUILD_PYTHON=${{ matrix.platform.build_python }} \
-DBUILD_EXAMPLES=ON \
${{ env.PYTHON_DIR }} \
${{ env.SWIG_DIR }}
${{ matrix.platform.build_python == 'ON' && env.SWIG_DIR || '' }}

- name: Build and install RoadRunner
shell: bash
Expand Down
8 changes: 0 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ project(
LANGUAGES CXX C
)

if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20")
# Source file extensions (.h/.cpp) do not need to be explicitly
# specified if CMP0115 set to OLD.
# New behavior requires all extensions be explicit
cmake_policy(SET CMP0115 OLD)
endif ()


if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
message(STATUS "Build on 32-bit platform")
else ()
Expand Down
70 changes: 0 additions & 70 deletions cmake/AddTestExecutable.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ set(SBMLTestSuiteStochastic "${SBMLTestSuiteRoot}/stochastic")
function(add_test_executable TEST_TARGET OUT_VARIABLE)
#message(STATUS "Adding test ${TEST_TARGET} as part of ${OUT_VARIABLE}. Source Files: ARGN: ${ARGN}" )
add_executable(${TEST_TARGET} ${ARGN} $<TARGET_OBJECTS:rr-mockups>
${ThisSourceDirectory}/TestModelFactory)
${ThisSourceDirectory}/TestModelFactory.cpp)

if (TEST_TARGET MATCHES ".*plugin.*")
set(TEST_PLUGIN_INCLUDE "$<TARGET_PROPERTY:telplugins_c_api,INCLUDE_DIRECTORIES>")
Expand Down
6 changes: 3 additions & 3 deletions wrappers/Python/roadrunner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ target_include_directories(roadrunner_python PUBLIC
if (WIN32)
target_compile_definitions(roadrunner_python PRIVATE EXPORT_RRC STATIC_RR)

swig_link_libraries(roadrunner_python
target_link_libraries(roadrunner_python
roadrunner-static
"${Python_LIBRARIES}"
)
# changes dll name to pyd sop that it is compatible with new Python standard
set_target_properties(roadrunner_python PROPERTIES SUFFIX ".pyd")
elseif (UNIX AND NOT APPLE)
# Linux specific code
swig_link_libraries(roadrunner_python
target_link_libraries(roadrunner_python
roadrunner-static

${Python_LIBRARIES}
Expand All @@ -120,7 +120,7 @@ elseif (APPLE)
INSTALL_RPATH "@loader_path/../../lib;@loader_path/"
INSTALL_NAME_DIR "@rpath")
# we use roadrunner not roadrunner-static so we can use shared libraries at runtime
swig_link_libraries(roadrunner_python
target_link_libraries(roadrunner_python
roadrunner-static
## ${Python_LIBRARIES}
)
Expand Down
Loading