diff options
| author | madmaxoft <github@xoft.cz> | 2014-05-02 19:34:28 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-05-02 19:34:28 +0200 |
| commit | 839447f0bbdf97eb9b3c07f943647fa9c92b1e5b (patch) | |
| tree | 3cde3e248dc73e19f3b241245fdff612842f9632 /lib | |
| parent | A tiny speed improvement in ApplyFoodExhaustion() (diff) | |
| parent | Fixed MagmaCube spawning. (diff) | |
| download | cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.gz cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.bz2 cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.lz cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.xz cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.zst cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.zip | |
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/expat/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | lib/inifile/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lib/luaexpat/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/md5/CMakeLists.txt | 1 | ||||
| m--------- | lib/polarssl | 0 | ||||
| -rw-r--r-- | lib/zlib/CMakeLists.txt | 1 |
6 files changed, 12 insertions, 6 deletions
diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt index 667804b9a..a23f16609 100644 --- a/lib/expat/CMakeLists.txt +++ b/lib/expat/CMakeLists.txt @@ -4,12 +4,11 @@ project (expat) file(GLOB SOURCE "*.c" + "*.h" ) -# add headers to MSVC project files: -if (WIN32) - file(GLOB HEADERS "*.h") - set(SOURCE ${SOURCE} ${HEADERS}) +# Set files to go to a "Sources" folder in MSVC project files: +if (MSVC) source_group("Sources" FILES ${SOURCE}) endif() diff --git a/lib/inifile/CMakeLists.txt b/lib/inifile/CMakeLists.txt index efbd09796..321d501d7 100644 --- a/lib/inifile/CMakeLists.txt +++ b/lib/inifile/CMakeLists.txt @@ -1,7 +1,11 @@ - cmake_minimum_required (VERSION 2.6) project (iniFile) include_directories ("${PROJECT_SOURCE_DIR}/../../src/") -add_library(iniFile iniFile) +file(GLOB SOURCE + "*.h" + "*.cpp" +) + +add_library(iniFile ${SOURCE}) diff --git a/lib/luaexpat/CMakeLists.txt b/lib/luaexpat/CMakeLists.txt index 7eef5c8ce..f6b21c1d7 100644 --- a/lib/luaexpat/CMakeLists.txt +++ b/lib/luaexpat/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/../") file(GLOB SOURCE "*.c" + "*.h" ) add_library(luaexpat ${SOURCE}) diff --git a/lib/md5/CMakeLists.txt b/lib/md5/CMakeLists.txt index 8ba09a0dd..cd9fe6320 100644 --- a/lib/md5/CMakeLists.txt +++ b/lib/md5/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/../../src/") file(GLOB SOURCE "*.cpp" + "*.h" ) add_library(md5 ${SOURCE}) diff --git a/lib/polarssl b/lib/polarssl -Subproject 2cb1a0c4009ecf368ecc74eb428394e10f9e6d0 +Subproject 1ed82759c68f92c4acc7e3f33b850cf9f01c8ab diff --git a/lib/zlib/CMakeLists.txt b/lib/zlib/CMakeLists.txt index 6c52578ee..74cf94f8b 100644 --- a/lib/zlib/CMakeLists.txt +++ b/lib/zlib/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/../../src/") file(GLOB SOURCE "*.c" + "*.h" ) if(NOT TARGET zlib) |