Skip to content
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

Simplify CMake Policies #6778

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Simplify CMake Policies #6778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
343f4d0
Simplify CMake Policies
tresf Jul 23, 2023
55937a9
Updates per comments
tresf Jul 26, 2023
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
13 changes: 1 addition & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
SET(LMMS_BINARY_DIR ${CMAKE_BINARY_DIR})
SET(LMMS_SOURCE_DIR ${CMAKE_SOURCE_DIR})

IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0005 NEW)
CMAKE_POLICY(SET CMP0003 NEW)
IF (CMAKE_MAJOR_VERSION GREATER 2)
CMAKE_POLICY(SET CMP0026 NEW)
CMAKE_POLICY(SET CMP0045 NEW)
CMAKE_POLICY(SET CMP0050 OLD)
ENDIF()
CMAKE_POLICY(SET CMP0020 NEW)
CMAKE_POLICY(SET CMP0057 NEW)
ENDIF(COMMAND CMAKE_POLICY)

# CMAKE_POLICY Section

# Import of windows.h breaks min()/max()
ADD_DEFINITIONS(-DNOMINMAX)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/DefineInstallVar.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function(DEFINE_INSTALL_VAR)
endif()
else()
if(VAR_GENERATOR_EXPRESSION)
cmake_policy(SET CMP0087 NEW)
cmake_policy(SET CMP0087 NEW) # install(CODE) and install(SCRIPT) support generator expressions.
endif()
install(CODE "set(\"${VAR_NAME}\" \"${VAR_CONTENT}\")")
endif()
Expand Down
3 changes: 0 additions & 3 deletions cmake/modules/InstallDependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
include(GetPrerequisites)
include(CMakeParseArguments)

CMAKE_POLICY(SET CMP0011 NEW)
CMAKE_POLICY(SET CMP0057 NEW)

function(make_absolute var)
get_filename_component(abs "${${var}}" ABSOLUTE BASE_DIR "${CMAKE_INSTALL_PREFIX}")
set(${var} ${abs} PARENT_SCOPE)
Expand Down
2 changes: 1 addition & 1 deletion plugins/CarlaBase/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# is updated to relink libcarlabase.dylib. MacOS 10.8 uses
# cmake 3.9.6, so this can be done at any time.
IF(NOT CMAKE_VERSION VERSION_LESS 3.9)
CMAKE_POLICY(SET CMP0068 OLD)
CMAKE_POLICY(SET CMP0068 OLD) # RPATH settings on macOS do not affect install_name.
ENDIF()
Comment on lines 5 to 7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now require CMake 3.9, so isn't it possible to either remove the if or switch to the NEW behavior?


# If Carla was not provided by the system, make a dummy library instead
Expand Down
2 changes: 1 addition & 1 deletion plugins/LadspaEffect/cmt/cmt
Open in desktop
Submodule cmt updated 44 files
+1 −2 README
+0 −16 doc/changes.html
+1 −1 doc/overview.html
+2 −1 src/am.cpp
+8 −5 src/ambisonic.cpp
+2 −1 src/amp.cpp
+2 −1 src/analogue.cpp
+2 −1 src/canyondelay.cpp
+2 −1 src/cmt.cpp
+2 −5 src/cmt.h
+15 −20 src/delay.cpp
+2 −1 src/descriptor.cpp
+2 −4 src/disintegrator.cpp
+2 −1 src/dynamic.cpp
+2 −1 src/filter.cpp
+18 −18 src/freeverb/Components/denormals.h
+26 −122 src/freeverb/Components/revmodel.cpp
+31 −5 src/freeverb/Components/revmodel.h
+60 −60 src/freeverb/Components/tuning.h
+4 −3 src/freeverb/freeverb.cpp
+67 −67 src/freeverb/readme.txt
+2 −1 src/grain.cpp
+2 −1 src/hardgate.cpp
+2 −5 src/init.cpp
+2 −1 src/ladspa_types.h
+2 −1 src/lofi.cpp
+2 −1 src/logistic.cpp
+2 −1 src/mixer.cpp
+2 −1 src/noise.cpp
+2 −1 src/null.cpp
+2 −1 src/organ.cpp
+2 −1 src/peak.cpp
+2 −1 src/phasemod.cpp
+2 −1 src/pink.cpp
+5 −3 src/pink_full.cpp
+2 −1 src/pink_sh.cpp
+2 −1 src/pinknoise.h
+2 −1 src/run_adding.h
+2 −1 src/sine.cpp
+2 −1 src/sledgehammer.cpp
+2 −1 src/syndrum.cpp
+2 −1 src/utils.h
+2 −1 src/vcf303.cpp
+2 −1 src/wshape_sine.cpp