Changeset cad08fb in nscp for CMakeLists.txt


Ignore:
Timestamp:
02/18/10 12:22:51 (3 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2
Children:
b0e7ecf
Parents:
60375ed
Message:

Major update with a new plugin glue that works better with *nix.
Everything should be the same but look tidier

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r60375ed rcad08fb  
    167167 
    168168SET(NSCP_DEF_PLUGIN_CPP 
    169   ${NSCP_INCLUDE_PATH}/NSCHelper.cpp 
    170169  ${NSCP_INCLUDE_PATH}/arrayBuffer.cpp 
    171170  ${NSCP_INCLUDE_PATH}/simpleini/ConvertUTF.c 
    172171  ${NSCP_INCLUDE_PATH}/b64/b64.c 
    173172  ${NSCP_INCLUDE_PATH}/utils.cpp 
     173  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_helper.cpp 
     174  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_plugin_wrapper.cpp 
     175  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_core_wrapper.cpp 
    174176) 
    175177 
    176178SET(NSCP_DEF_PLUGIN_HPP 
    177   ${NSCP_INCLUDE_PATH}/NSCHelper.h 
    178179  ${NSCP_INCLUDE_PATH}/strEx.h 
    179180  ${NSCP_INCLUDE_PATH}/config.h 
    180181  ${NSCP_INCLUDE_PATH}/utils.h 
    181182  ${NSCP_INCLUDE_PATH}/NSCAPI.h 
    182   ${NSCP_INCLUDE_PATH}/NSCHelper.h 
    183   ${NSCP_INCLUDE_PATH}/nsc_module_wrapper.hpp 
     183  ${NSCP_INCLUDE_PATH}/nscapi/macros.hpp 
     184  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_helper.hpp 
     185  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_plugin_wrapper.hpp  
     186  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_core_wrapper.hpp 
    184187) 
    185188 
     
    244247endif() 
    245248 
    246 IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") 
    247 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC"  ) 
    248 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fPIC"  ) 
    249 ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") 
    250  
    251  
     249IF(CMAKE_COMPILER_IS_GNUCXX) 
     250  IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE) 
     251    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC"  ) 
     252    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fPIC"  ) 
     253  ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE) 
     254ENDIF(CMAKE_COMPILER_IS_GNUCXX) 
     255 
     256 
Note: See TracChangeset for help on using the changeset viewer.