68 lines
1.8 KiB
Text
68 lines
1.8 KiB
Text
--- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200
|
|
+++ CMakeLists.txt 2013-06-12 09:22:45.000000000 +0200
|
|
@@ -305,31 +305,11 @@
|
|
ENDIF()
|
|
|
|
ADD_SUBDIRECTORY(extra)
|
|
-IF(NOT WITHOUT_SERVER)
|
|
- ADD_SUBDIRECTORY(tests)
|
|
- ADD_SUBDIRECTORY(client)
|
|
- ADD_SUBDIRECTORY(sql)
|
|
- ADD_SUBDIRECTORY(sql/share)
|
|
- ADD_SUBDIRECTORY(libservices)
|
|
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
|
|
- IF(WITH_EMBEDDED_SERVER)
|
|
- ADD_SUBDIRECTORY(libmysqld)
|
|
- ADD_SUBDIRECTORY(libmysqld/examples)
|
|
- ENDIF(WITH_EMBEDDED_SERVER)
|
|
-
|
|
- ADD_SUBDIRECTORY(mysql-test)
|
|
- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
|
|
- ADD_SUBDIRECTORY(support-files)
|
|
- ADD_SUBDIRECTORY(scripts)
|
|
- ADD_SUBDIRECTORY(sql-bench)
|
|
- IF(UNIX)
|
|
- ADD_SUBDIRECTORY(man)
|
|
- ENDIF()
|
|
- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
|
|
- ADD_SUBDIRECTORY(internal)
|
|
- ENDIF()
|
|
- ADD_SUBDIRECTORY(packaging/rpm-uln)
|
|
-ENDIF()
|
|
+ADD_SUBDIRECTORY(client)
|
|
+ADD_SUBDIRECTORY(libservices)
|
|
+ADD_SUBDIRECTORY(support-files)
|
|
+ADD_SUBDIRECTORY(scripts)
|
|
+ADD_SUBDIRECTORY(man)
|
|
|
|
INCLUDE(cmake/abi_check.cmake)
|
|
INCLUDE(cmake/tags.cmake)
|
|
@@ -365,8 +345,10 @@
|
|
ELSE()
|
|
SET(CPACK_GENERATOR "TGZ")
|
|
ENDIF()
|
|
+IF(FALSE)
|
|
ADD_SUBDIRECTORY(packaging/WiX)
|
|
ADD_SUBDIRECTORY(packaging/solaris)
|
|
+ENDIF()
|
|
|
|
# Create a single package with "make package"
|
|
# (see http://public.kitware.com/Bug/view.php?id=11452)
|
|
@@ -374,11 +356,11 @@
|
|
|
|
INCLUDE(CPack)
|
|
IF(UNIX)
|
|
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
|
|
ENDIF()
|
|
#
|
|
# RPM installs documentation directly from the source tree
|
|
#
|
|
+IF(FALSE)
|
|
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
INSTALL(FILES COPYING LICENSE.mysql
|
|
DESTINATION ${INSTALL_DOCREADMEDIR}
|
|
@@ -404,3 +386,4 @@
|
|
PATTERN "sp-imp-spec.txt" EXCLUDE
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|