diff --git a/CMakeLists.txt b/CMakeLists.txt index 1029e2dbfa7..85b3a61e89d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -979,6 +979,21 @@ target_compile_definitions(mixxx-lib PUBLIC $<$>:NDEBUG> ) +# +# Installation directories +# +set(MIXXX_INSTALL_BINDIR ".") +set(MIXXX_INSTALL_DATADIR ".") +set(MIXXX_INSTALL_DOCDIR "./doc") +set(MIXXX_INSTALL_LICENSEDIR "./doc") +if (UNIX) + include(GNUInstallDirs) + set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}") + set(MIXXX_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mixxx") + set(MIXXX_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}/mixxx") + set(MIXXX_INSTALL_LICENSEDIR "${CMAKE_INSTALL_DATADIR}/licenses/mixxx") +endif() + if(WIN32) target_compile_definitions(mixxx-lib PRIVATE __WINDOWS__) @@ -1017,9 +1032,7 @@ elseif(UNIX) else() target_compile_definitions(mixxx-lib PRIVATE __UNIX__) target_compile_definitions( - mixxx-lib PUBLIC UNIX_SHARE_PATH="${CMAKE_INSTALL_PREFIX}/share/mixxx") - target_compile_definitions( - mixxx-lib PUBLIC UNIX_LIB_PATH="${CMAKE_INSTALL_PREFIX}/lib/mixxx") + mixxx-lib PUBLIC UNIX_SHARE_PATH="${MIXXX_INSTALL_DATADIR}") if(CMAKE_SYSTEM_NAME STREQUAL Linux) target_compile_definitions(mixxx-lib PUBLIC __LINUX__) elseif(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$") @@ -1036,18 +1049,6 @@ target_link_libraries(mixxx PUBLIC mixxx-lib) # Installation and Packaging # include(InstallRequiredSystemLibraries) -set(MIXXX_INSTALL_BINDIR ".") -set(MIXXX_INSTALL_DATADIR ".") -set(MIXXX_INSTALL_DOCDIR "./doc") -set(MIXXX_INSTALL_LICENSEDIR "./doc") -if (UNIX) - include(GNUInstallDirs) - set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}") - set(MIXXX_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mixxx") - set(MIXXX_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}/mixxx") - set(MIXXX_INSTALL_LICENSEDIR "${CMAKE_INSTALL_DATADIR}/licenses/mixxx") -endif() - install( TARGETS mixxx diff --git a/SConscript b/SConscript index 5b04051cbc6..265043b9566 100644 --- a/SConscript +++ b/SConscript @@ -367,8 +367,6 @@ if build.platform_is_linux or build.platform_is_bsd: env.get('SHAREDIR', default='share')) unix_bin_path = os.path.join(install_root, env.get('BINDIR', default='bin')) - unix_lib_path = os.path.join(install_root, - env.get('LIBDIR', default='lib')) binary = env.Install(unix_bin_path, binary_files) skins = env.Install(os.path.join(unix_share_path, 'mixxx', 'skins'), skin_files) diff --git a/build/depends.py b/build/depends.py index 77b15aea5b5..892188cb8a5 100644 --- a/build/depends.py +++ b/build/depends.py @@ -1631,8 +1631,6 @@ def configure(self, build, conf): CPPDEFINES=('UNIX_SHARE_PATH', r'\"%s\"' % share_path)) lib_path = os.path.join(prefix, build.env.get( 'LIBDIR', default='lib'), 'mixxx') - build.env.Append( - CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path)) def depends(self, build): return [SoundTouch, ReplayGain, Ebur128Mit, PortAudio, PortMIDI, Qt, TestHeaders,