diff options
author | sfan5 <sfan5@live.de> | 2015-04-27 16:17:10 +0200 |
---|---|---|
committer | sfan5 <sfan5@live.de> | 2015-04-27 16:24:49 +0200 |
commit | 4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d (patch) | |
tree | 4cb19102443b8ea6f566522c964ba92c905a55a8 /src/CMakeLists.txt | |
parent | 558d715bf62b000c9b10b44a0e3591ed4e669fa5 (diff) | |
download | minetest-4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d.tar.gz minetest-4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d.tar.bz2 minetest-4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d.zip |
Revert the upper-case PROJECT_NAME nonsense that was part of #2402
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3a8a432ea..66c8170cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 2.6) -project(Minetest) -string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) +project(minetest) INCLUDE(CheckIncludeFiles) @@ -465,10 +464,10 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin") if(BUILD_CLIENT) - add_executable(${PROJECT_NAME_LOWER} ${client_SRCS}) - add_dependencies(${PROJECT_NAME_LOWER} GenerateVersion) + add_executable(${PROJECT_NAME} ${client_SRCS}) + add_dependencies(${PROJECT_NAME} GenerateVersion) set(client_LIBS - ${PROJECT_NAME_LOWER} + ${PROJECT_NAME} ${ZLIB_LIBRARIES} ${IRRLICHT_LIBRARY} ${OPENGL_LIBRARIES} @@ -497,37 +496,37 @@ if(BUILD_CLIENT) endif() if(USE_CURL) target_link_libraries( - ${PROJECT_NAME_LOWER} + ${PROJECT_NAME} ${CURL_LIBRARY} ) endif() if(USE_FREETYPE) if(FREETYPE_PKGCONFIG_FOUND) - set_target_properties(${PROJECT_NAME_LOWER} + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}" ) endif() target_link_libraries( - ${PROJECT_NAME_LOWER} + ${PROJECT_NAME} ${FREETYPE_LIBRARY} ${CGUITTFONT_LIBRARY} ) endif() if (USE_LEVELDB) - target_link_libraries(${PROJECT_NAME_LOWER} ${LEVELDB_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${LEVELDB_LIBRARY}) endif() if (USE_REDIS) - target_link_libraries(${PROJECT_NAME_LOWER} ${REDIS_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${REDIS_LIBRARY}) endif() endif(BUILD_CLIENT) if(BUILD_SERVER) - add_executable(${PROJECT_NAME_LOWER}server ${server_SRCS}) - add_dependencies(${PROJECT_NAME_LOWER}server GenerateVersion) + add_executable(${PROJECT_NAME}server ${server_SRCS}) + add_dependencies(${PROJECT_NAME}server GenerateVersion) target_link_libraries( - ${PROJECT_NAME_LOWER}server + ${PROJECT_NAME}server ${ZLIB_LIBRARIES} ${SQLITE3_LIBRARY} ${JSON_LIBRARY} @@ -535,17 +534,17 @@ if(BUILD_SERVER) ${LUA_LIBRARY} ${PLATFORM_LIBS} ) - set_target_properties(${PROJECT_NAME_LOWER}server PROPERTIES + set_target_properties(${PROJECT_NAME}server PROPERTIES COMPILE_DEFINITIONS "SERVER") if (USE_LEVELDB) - target_link_libraries(${PROJECT_NAME_LOWER}server ${LEVELDB_LIBRARY}) + target_link_libraries(${PROJECT_NAME}server ${LEVELDB_LIBRARY}) endif() if (USE_REDIS) - target_link_libraries(${PROJECT_NAME_LOWER}server ${REDIS_LIBRARY}) + target_link_libraries(${PROJECT_NAME}server ${REDIS_LIBRARY}) endif() if(USE_CURL) target_link_libraries( - ${PROJECT_NAME_LOWER}server + ${PROJECT_NAME}server ${CURL_LIBRARY} ) endif() @@ -646,7 +645,7 @@ if(WIN32) endif() if(BUILD_CLIENT) - install(TARGETS ${PROJECT_NAME_LOWER} + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${BINDIR} ARCHIVE DESTINATION ${BINDIR} @@ -664,7 +663,7 @@ if(BUILD_CLIENT) if(USE_GETTEXT) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE}) - set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME_LOWER}.mo") + set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo") install(FILES ${MO_BUILD_PATH} DESTINATION ${MO_DEST_PATH}) endforeach() endif() @@ -685,16 +684,16 @@ if(BUILD_CLIENT) endif(BUILD_CLIENT) if(BUILD_SERVER) - install(TARGETS ${PROJECT_NAME_LOWER}server DESTINATION ${BINDIR}) + install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR}) endif() if (USE_GETTEXT) set(MO_FILES) foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES}) - set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME_LOWER}.po") + set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME}.po") set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE}) - set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME_LOWER}.mo") + set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo") add_custom_command(OUTPUT ${MO_BUILD_PATH} COMMAND ${CMAKE_COMMAND} -E make_directory ${MO_BUILD_PATH} |