Просмотр исходного кода

Merge pull request #927 from yuriks/getopt-fix

getopt: Fix compilation settings.
Tony Wasserka 11 лет назад
Родитель
Сommit
ecdfd0643a
2 измененных файлов с 2 добавлено и 3 удалено
  1. 2 2
      externals/getopt/CMakeLists.txt
  2. 0 1
      externals/getopt/getopt.c

+ 2 - 2
externals/getopt/CMakeLists.txt

@@ -7,5 +7,5 @@ set(HEADERS
 
 
 create_directory_groups(${SRCS} ${HEADERS})
 create_directory_groups(${SRCS} ${HEADERS})
 add_library(getopt ${SRCS} ${HEADERS})
 add_library(getopt ${SRCS} ${HEADERS})
-target_compile_definitions(getopt INTERFACE STATIC_GETOPT)
-target_include_directories(getopt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_compile_definitions(getopt PUBLIC STATIC_GETOPT)
+target_include_directories(getopt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

+ 0 - 1
externals/getopt/getopt.c

@@ -35,7 +35,6 @@ PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
 YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
 YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
 EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 */
 */
-#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdio.h>
 #ifdef _MSC_VER
 #ifdef _MSC_VER