diff options
| author | dec05eba <dec05eba@protonmail.com> | 2018-01-02 19:30:52 +0100 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2018-01-02 20:10:53 +0100 |
| commit | 8ac9ddf460cc4c1b2972df1069128fb615b31042 (patch) | |
| tree | 8fac0b3171f1fb2a39a10af5abff71a304100dc4 /src/CmakeModule.cpp | |
| parent | 87a65f6913429b26e63fdee17cb8cfe93990db35 (diff) | |
Fix bug when using config for several platforms in one project
Diffstat (limited to 'src/CmakeModule.cpp')
| -rw-r--r-- | src/CmakeModule.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/CmakeModule.cpp b/src/CmakeModule.cpp index 1995023..e05a65f 100644 --- a/src/CmakeModule.cpp +++ b/src/CmakeModule.cpp @@ -133,20 +133,14 @@ namespace sibs if(config.getPackageType() != PackageType::EXECUTABLE) { - #if OS_TYPE == OS_TYPE_WINDOWS - const _tinydir_char_t *libFileExtension = TINYDIR_STRING("lib"); - #elif OS_TYPE == OS_TYPE_LINUX - const _tinydir_char_t *libFileExtension = TINYDIR_STRING("so"); - #endif - FileString libFile; u64 libFileLastModified = 0; string buildPathUtf8 = toUtf8(buildPath); nprintf("Searching for library generate by cmake in build path: %s\n", buildPathUtf8.c_str()); - walkDirFiles(buildPath.c_str(), [&libFileExtension, &libFile, &libFileLastModified](tinydir_file *file) + walkDirFiles(buildPath.c_str(), [&libFile, &libFileLastModified](tinydir_file *file) { - if(_tinydir_strcmp(file->extension, libFileExtension) == 0) + if(_tinydir_strcmp(file->extension, CONFIG_DYNAMIC_LIB_FILE_EXTENSION) == 0) { u32 fileLastModified = getFileLastModifiedTime(file->path); if(fileLastModified > libFileLastModified) @@ -190,7 +184,6 @@ namespace sibs // TODO: Clean this up. The below code is indentical to code in Ninja.cpp....... string projectPathUtf8 = toUtf8(config.getProjectPath()); - printf("BUILD CMAKE MODULE!, num global include dirs: %d\n", config.getGlobalIncludeDirs().size()); for (const string &globalIncludeDir : config.getGlobalIncludeDirs()) { string globalIncludeDirFull = projectPathUtf8; |