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

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(libs)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
 if (MINGW)
-	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 	find_package(MinGW REQUIRED)
 endif ()
 set(LIB 1)
@@ -11,14 +11,25 @@ set(CRYPT 1)
 set(LIBPROJECT 1)
 set(PIP_LIBRARY pip)
 set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo")
+set(PIP_INCLUDES)
 foreach(F ${PIP_FOLDERS})
-	set(PIP_INCLUDES ${PIP_INCLUDES} "../pip/src/${F}")
+	list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src/${F}")
 endforeach(F)
+#message(${PIP_INCLUDES})
+set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg")
+if (WIN32)
+	set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip")
+	string(REPLACE "/" "\\" PIP_DLL_DIR_W "${PIP_DLL_DIR}")
+	set(ENV{PATH} "$ENV{PATH}\;${PIP_DLL_DIR_W}")
+	#message($ENV{PATH})
+endif()
+
 set(LIST_LIBS pip qad_widgets qad_utils qad_application qad_blockview qad_graphic qad_sql_table piqt mbricks cd_utils kx_utils piqt_utils touch_widgets qglview)
 foreach(L ${LIST_LIBS})
 	add_subdirectory(${L})
 	include_directories(${L})
 endforeach(L)
+
 if (WIN32)
 	get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR})