change install path to /usr/local

git-svn-id: svn://db.shs.com.ru/libs@713 a8b55f48-bf90-11e4-a774-851b48703e85
2020-01-21 10:09:48 +00:00
parent b4d1a7839c
commit aece628030
7 changed files with 25 additions and 53 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,6 @@ if(LIB)
 		if(MINGW)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		endif()
-	else()
-		if(APPLE)
-			set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
 	else()
 		if (DEFINED ANDROID_PLATFORM)
 			set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
@@ -73,8 +70,7 @@ if(LIB)
 			if(CMAKE_CROSSCOMPILING)
 				set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
 			else()
-					set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
-				endif()
+				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
 			endif()
 		endif()
 	endif()
--- a/cd_utils/CMakeLists.txt
+++ b/cd_utils/CMakeLists.txt
@@ -37,9 +37,6 @@ if(NOT LIBPROJECT)
 			if(MINGW)
 				set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 			endif()
-		else()
-			if(APPLE)
-				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
 		else()
 			if (DEFINED ANDROID_PLATFORM)
 				set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
@@ -47,8 +44,7 @@ if(NOT LIBPROJECT)
 				if(CMAKE_CROSSCOMPILING)
 					set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
 				else()
-						set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
-					endif()
+					set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
 				endif()
 			endif()
 		endif()
--- a/kx_utils/CMakeLists.txt
+++ b/kx_utils/CMakeLists.txt
@@ -51,15 +51,11 @@ if (LIB)
 		install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE})
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-	else()
-		if(APPLE)
-			set(CMAKE_INSTALL_PREFIX /usr/local)
 	else()
 		if (DEFINED ANDROID_PLATFORM)
 			set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
 		else()
-				set(CMAKE_INSTALL_PREFIX /usr)
-			endif()
+			set(CMAKE_INSTALL_PREFIX /usr/local)
 		endif()
 		install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
--- a/piqt_utils/piconnedit/CMakeLists.txt
+++ b/piqt_utils/piconnedit/CMakeLists.txt
@@ -8,15 +8,11 @@ message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
 		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-	else()
-		if(APPLE)
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 	else()
 		if (DEFINED ANDROID_PLATFORM)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin)
 		else()
-				qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
-			endif()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		endif()
 	endif()
 	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
--- a/piqt_utils/pidumper/CMakeLists.txt
+++ b/piqt_utils/pidumper/CMakeLists.txt
@@ -8,15 +8,11 @@ message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
 		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-	else()
-		if(APPLE)
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 	else()
 		if (DEFINED ANDROID_PLATFORM)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin)
 		else()
-				qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
-			endif()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		endif()
 	endif()
 	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
--- a/piqt_utils/piintrospector/CMakeLists.txt
+++ b/piqt_utils/piintrospector/CMakeLists.txt
@@ -10,15 +10,11 @@ message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
 		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-	else()
-		if(APPLE)
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 	else()
 		if (DEFINED ANDROID_PLATFORM)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin)
 		else()
-				qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
-			endif()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		endif()
 	endif()
 	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
--- a/qcd_utils/pult/CMakeLists.txt
+++ b/qcd_utils/pult/CMakeLists.txt
@@ -8,15 +8,11 @@ message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
 		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-	else()
-		if(APPLE)
-			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 	else()
 		if (DEFINED ANDROID_PLATFORM)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin)
 		else()
-				qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
-			endif()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		endif()
 	endif()
 	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")