git-svn-id: svn://db.shs.com.ru/libs@207 a8b55f48-bf90-11e4-a774-851b48703e85

qad/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(qad)
 cmake_minimum_required(VERSION 2.6)
-include(./QtProject.cmake)
+include(QtProject.cmake)
 if (LIBPROJECT)
 	include(../SDKMacros.cmake)
 else()
@@ -10,6 +10,7 @@ else()
 	if (DEBUG)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	endif ()
+	set(QAD_STANDALONE 1)
 endif()
 find_package(OpenGL REQUIRED)
 if (MINGW)
@@ -22,17 +23,17 @@ if (NOT LIBPROJECT)
 	if (LIB)
 		if (WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-		else ()
+		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
 			else()
 				set(CMAKE_INSTALL_PREFIX /usr)
 			endif()
-		endif ()
+		endif()
 		message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
-	else ()
+	else()
 		message(STATUS "Install to local \"bin\"")
-	endif ()
+	endif()
 endif()
 set(CMAKES "FindQAD.cmake" "QtProject.cmake")
 install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
@@ -51,15 +52,15 @@ macro(qad_install _TARGET _H_FILES)
 				install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
 				get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
 				install(TARGETS ${_TARGET} DESTINATION ${QTDIR})
-			else ()
-				if (NOT _H_FILES STREQUAL "")
+			else()
+				if(NOT _H_FILES STREQUAL "")
 					install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
 				endif()
 				install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-			endif ()
-		else ()
+			endif()
+		else()
 			install(TARGETS ${_TARGET} DESTINATION bin)
-		endif ()
+		endif()
 	endif()
 endmacro()
 

qad/FindQAD.cmake

@@ -1,4 +1,8 @@
-include(QtProject)
+if(LIBPROJECT OR QAD_STANDALONE)
+	include(QtProject.cmake)
+else()
+
+endif()
 set(_SEARCH_DIR)
 if(WIN32)
 	find_package(MinGW REQUIRED)